Skip to content

Commit

Permalink
Support for Gold SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
John Murray committed Feb 13, 2013
1 parent b101a30 commit 46b625d
Show file tree
Hide file tree
Showing 26 changed files with 160 additions and 538 deletions.
186 changes: 77 additions & 109 deletions PasswordSample/.cproject

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions PasswordSample/.project
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>com.rim.tad.tools.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
Expand Down
56 changes: 32 additions & 24 deletions PasswordSample/.settings/org.eclipse.cdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,25 +1,33 @@
eclipse.preferences.version=1
environment/project/com.qnx.qcc.toolChain.1303470935/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1303470935/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.1303470935/CPULIST/value=x86
environment/project/com.qnx.qcc.toolChain.1303470935/VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1303470935/VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.1303470935/VARIANTLIST/value=g
environment/project/com.qnx.qcc.toolChain.1303470935/append=true
environment/project/com.qnx.qcc.toolChain.1303470935/appendContributed=true
environment/project/com.qnx.qcc.toolChain.216589881/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.216589881/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.216589881/CPULIST/value=arm
environment/project/com.qnx.qcc.toolChain.216589881/VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.216589881/VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.216589881/VARIANTLIST/value=g
environment/project/com.qnx.qcc.toolChain.216589881/append=true
environment/project/com.qnx.qcc.toolChain.216589881/appendContributed=true
environment/project/com.qnx.qcc.toolChain.395300360/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.395300360/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.395300360/CPULIST/value=arm
environment/project/com.qnx.qcc.toolChain.395300360/EXCLUDE_VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.395300360/EXCLUDE_VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.395300360/EXCLUDE_VARIANTLIST/value=r
environment/project/com.qnx.qcc.toolChain.395300360/append=true
environment/project/com.qnx.qcc.toolChain.395300360/appendContributed=true
environment/project/com.qnx.qcc.toolChain.1482368174/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1482368174/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.1482368174/CPULIST/value=x86
environment/project/com.qnx.qcc.toolChain.1482368174/VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1482368174/VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.1482368174/VARIANTLIST/value=g
environment/project/com.qnx.qcc.toolChain.1482368174/append=true
environment/project/com.qnx.qcc.toolChain.1482368174/appendContributed=true
environment/project/com.qnx.qcc.toolChain.1683446175/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1683446175/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.1683446175/CPULIST/value=arm
environment/project/com.qnx.qcc.toolChain.1683446175/VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.1683446175/VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.1683446175/VARIANTLIST/value=g
environment/project/com.qnx.qcc.toolChain.1683446175/append=true
environment/project/com.qnx.qcc.toolChain.1683446175/appendContributed=true
environment/project/com.qnx.qcc.toolChain.203132946/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.203132946/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.203132946/CPULIST/value=arm
environment/project/com.qnx.qcc.toolChain.203132946/EXCLUDE_VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.203132946/EXCLUDE_VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.203132946/EXCLUDE_VARIANTLIST/value=p
environment/project/com.qnx.qcc.toolChain.203132946/append=true
environment/project/com.qnx.qcc.toolChain.203132946/appendContributed=true
environment/project/com.qnx.qcc.toolChain.417303405/CPULIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.417303405/CPULIST/operation=append
environment/project/com.qnx.qcc.toolChain.417303405/CPULIST/value=arm
environment/project/com.qnx.qcc.toolChain.417303405/EXCLUDE_VARIANTLIST/delimiter=,
environment/project/com.qnx.qcc.toolChain.417303405/EXCLUDE_VARIANTLIST/operation=append
environment/project/com.qnx.qcc.toolChain.417303405/EXCLUDE_VARIANTLIST/value=r
environment/project/com.qnx.qcc.toolChain.417303405/append=true
environment/project/com.qnx.qcc.toolChain.417303405/appendContributed=true
35 changes: 3 additions & 32 deletions PasswordSample/Makefile
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
QMAKE_TARGET = PasswordSample
QMAKE = $(QNX_HOST)/usr/bin/qmake
TARGET = $(QMAKE_TARGET)
PROJECT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
I18N_DIR := $(PROJECT_DIR)/translations

include mk/cs-base.mk

all: Makefile $(QMAKE_TARGET)

clean:
$(MAKE) -C ./arm -f Makefile sureclean
$(MAKE) -C ./x86 -f Makefile sureclean


Makefile: FORCE
$(QMAKE) -spec unsupported/blackberry-armv7le-qcc -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
$(QMAKE) -spec unsupported/blackberry-x86-qcc -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
$(MAKE) -C ./translations -f Makefile update release

FORCE:

$(QMAKE_TARGET): device simulator

device:
$(MAKE) -C ./arm -f Makefile all

Device-Debug: Makefile
$(MAKE) -C ./arm -f Makefile debug

Device-Release: Makefile
$(MAKE) -C ./arm -f Makefile release

simulator:
$(MAKE) -C ./x86 -f Makefile all

Simulator-Debug: Makefile
$(MAKE) -C ./x86 -f Makefile debug
54 changes: 4 additions & 50 deletions PasswordSample/PasswordSample.pro
Original file line number Diff line number Diff line change
@@ -1,52 +1,6 @@
TEMPLATE = app
TARGET = PasswordSample
APP_NAME = PasswordSample

CONFIG += qt warn_on debug_and_release cascades

INCLUDEPATH += ../src
SOURCES += ../src/*.cpp
HEADERS += ../src/*.hpp ../src/*.h
LIBS += -lbbsystem
LIBS += -lhuapi

lupdate_inclusion {
SOURCES += ../assets/*.qml
}

device {
CONFIG(release, debug|release) {
DESTDIR = o.le-v7
}
CONFIG(debug, debug|release) {
DESTDIR = o.le-v7-g
}
}

simulator {
CONFIG(release, debug|release) {
DESTDIR = o
}
CONFIG(debug, debug|release) {
DESTDIR = o-g
}
}

OBJECTS_DIR = $${DESTDIR}/.obj
MOC_DIR = $${DESTDIR}/.moc
RCC_DIR = $${DESTDIR}/.rcc
UI_DIR = $${DESTDIR}/.ui

suredelete.target = sureclean
suredelete.commands = $(DEL_FILE) $${MOC_DIR}/*; $(DEL_FILE) $${RCC_DIR}/*; $(DEL_FILE) $${UI_DIR}/*
suredelete.depends = distclean

QMAKE_EXTRA_TARGETS += suredelete

TRANSLATIONS = \
$${TARGET}_en_GB.ts \
$${TARGET}_fr.ts \
$${TARGET}_it.ts \
$${TARGET}_de.ts \
$${TARGET}_es.ts \
$${TARGET}.ts
CONFIG += qt warn_on cascades10
LIBS += -lbbsystem -lhuapi

include(config.pri)
7 changes: 4 additions & 3 deletions PasswordSample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).

**Release History**

* **V1.0.1** - Updates for Gold SDK and 720x720 screen on Dev Alpha "C"
* **V1** - Initial release

**Known Issues**
Expand All @@ -34,8 +35,8 @@ None.

**Dependencies**

1. BlackBerry Dev Alpha Beta 4 Device Software **10.0.9**
1. BlackBerry 10 Native SDK for Beta 4 **10.0.9**
1. BlackBerry 10 Device Software **10.0.9**
1. BlackBerry 10 Native SDK **10.0.9** (Gold)

**How to Build PasswordSample**

Expand All @@ -47,7 +48,7 @@ If you don't want to build this sample application yourself we've included a
pre-build and signed BAR files for each version. You can find them in the
folder **"/installable-bar-files"** as follows:

* **PasswordSample-1\_0\_0\_11.bar** -- Signed BAR file for Version 1 (V1) of the application ( requires BlackBerry Dev Alpha Device Beta 4 Software 10.0.9 )
* **PasswordSample-1\_0\_1\_29.bar** -- Signed BAR file for Version 1.0.1 (V1.0.1) of the application ( requires BlackBerry 10 Device Software 10.0.9 )

**To contribute code to this repository you must be [signed up as an
official contributor](http://blackberry.github.com/howToContribute.html).**
Expand Down
2 changes: 1 addition & 1 deletion PasswordSample/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ TabbedPane {
}
Label {
id: lblHeading_version
text: qsTr("V1.0.0")
text: qsTr("V1.0.1")
verticalAlignment: VerticalAlignment.Center
horizontalAlignment: HorizontalAlignment.Center
}
Expand Down
49 changes: 24 additions & 25 deletions PasswordSample/bar-descriptor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->

-->
<qnx xmlns="http://www.qnx.com/schemas/application/1.0">

<!-- BlackBerry Tablet OS application descriptor file.
Expand All @@ -36,8 +35,8 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required. -->
<versionNumber>1.0.0</versionNumber>r>
<buildIdFile>buildnum</buildIdFile>
<versionNumber>1.0.1</versionNumber>
<buildIdFile>buildnum</buildIdFile>

<!-- Fourth digit segment of the package version. First three segments are taken from the
<versionNumber> element. Must be an integer from 0 to 2^16-1 -->
Expand Down Expand Up @@ -66,40 +65,40 @@

<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<configuration id="com.qnx.qcc.toolChain.986697364" name="Default">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.216589881" name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.395300360" name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1303470935" name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>

<!-- The icon for the application, which should be 86x86. -->
<icon>
<image>icon.png</image>
<image>icon.png</image>
</icon>
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>
<configuration name="Device-Release">
<entryPointType>Qnx/Cascades</entryPointType>
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7/PasswordSample.so" entry="true" type="Qnx/Elf">PasswordSample.so</asset>
</configuration>
<configuration name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm-p/o.le-v7-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>
<configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/PasswordSample" entry="true" type="Qnx/Elf">PasswordSample</asset>
</configuration>

<!-- The icon for the application, which should be 86x86. -->

<asset path="icon.png">icon.png</asset>
<asset path="assets">assets</asset>

<!-- Locale support -->
<asset path="translations" dest="qm">
<include name="*.qm"/>
</asset>
<asset path="icon.png">icon.png</asset>

<!-- Request permission to execute native code. Required for native applications. -->
<permission system="true">run_native</permission>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib"/>

<cascadesTheme>dark</cascadesTheme>

</qnx>
2 changes: 1 addition & 1 deletion PasswordSample/buildnum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
30
5 changes: 4 additions & 1 deletion PasswordSample/config.pri
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Auto-generated by IDE. All changes by user will be lost!
# Created at 30/11/12 15:38
# Created at 13/02/13 15:18

BASEDIR = $$_PRO_FILE_PWD_

Expand All @@ -21,6 +21,9 @@ HEADERS += \
$$BASEDIR/src/Timer.hpp \
$$BASEDIR/src/Utilities.hpp

CONFIG += precompile_header
PRECOMPILED_HEADER = $$BASEDIR/precompiled.h

lupdate_inclusion {
SOURCES += \
$$BASEDIR/../assets/*.qml
Expand Down
4 changes: 0 additions & 4 deletions PasswordSample/device-assets.xml

This file was deleted.

Binary file not shown.
2 changes: 2 additions & 0 deletions PasswordSample/precompiled.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// This file is used to store precompiled headers.
// It is intentionally left blank. It is up to you to decide which headers should be included here.
3 changes: 2 additions & 1 deletion PasswordSample/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@

#include <QLocale>
#include <QTranslator>
#include <Qt/qdeclarativedebug.h>
#include "PasswordSample.hpp"

using namespace bb::cascades;

int main(int argc, char **argv)
Q_DECL_EXPORT int main(int argc, char **argv)
{
// this is where the server is started etc
Application app(argc, argv);
Expand Down
1 change: 0 additions & 1 deletion PasswordSample/translations/PasswordSample.qm

This file was deleted.

2 changes: 1 addition & 1 deletion PasswordSample/translations/PasswordSample.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</message>
<message>
<location filename="../assets/main.qml" line="386"/>
<source>V1.0.0</source>
<source>V1.0.1</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
Binary file removed PasswordSample/translations/PasswordSample_de.qm
Binary file not shown.
57 changes: 0 additions & 57 deletions PasswordSample/translations/PasswordSample_de.ts

This file was deleted.

Binary file removed PasswordSample/translations/PasswordSample_en_GB.qm
Binary file not shown.
Loading

0 comments on commit 46b625d

Please sign in to comment.