Merge pull request #53 from jhoffmannrim/next

update Makefiles, project files and bar-descriptor.xml files

.gitignore

@@ -20,28 +20,24 @@ Simulator/
 Accelerometer/arm/o.le-v7-g/Accelerometer
 Accelerometer/arm/o.le-v7/Accelerometer
 Accelerometer/x86/o-g/Accelerometer
-Accelerometer/x86/o/Accelerometer
 AudioControl/arm/o.le-v7-g/AudioControl
 AudioControl/arm/o.le-v7/AudioControl
 AudioControl/x86/o-g/AudioControl
-AudioControl/x86/o/AudioControl
 Camera/arm/o.le-v7-g/Camera
 Camera/arm/o.le-v7/Camera
+Camera/x86/o-g/Camera
 Channels/arm/o.le-v7-g/Channels
 Channels/arm/o.le-v7/Channels
 Channels/x86/o-g/Channels
 CubeRotate/arm/o.le-v7-g/CubeRotate
 CubeRotate/arm/o.le-v7/CubeRotate
 CubeRotate/x86/o-g/CubeRotate
-CubeRotate/x86/o/CubeRotate
 Dialog/arm/o.le-v7-g/Dialog
 Dialog/arm/o.le-v7/Dialog
 Dialog/x86/o-g/Dialog
-Dialog/x86/o/Dialog
 FallingBlocks/arm/o.le-v7-g/FallingBlocks
 FallingBlocks/arm/o.le-v7/FallingBlocks
 FallingBlocks/x86/o-g/FallingBlocks
-FallingBlocks/x86/o/FallingBlocks
 GLES11Template/arm/o.le-v7-g/GLES11Template
 GLES11Template/arm/o.le-v7/GLES11Template
 GLES11Template/x86/o-g/GLES11Template
@@ -51,59 +47,45 @@ GLES20Template/x86/o-g/GLES20Template
 Geolocation/arm/o.le-v7-g/Geolocation
 Geolocation/arm/o.le-v7/Geolocation
 Geolocation/x86/o-g/Geolocation
-Geolocation/x86/o/Geolocation
 Gesture/arm/o.le-v7-g/Gesture
 Gesture/arm/o.le-v7/Gesture
 Gesture/x86/o-g/Gesture
-Gesture/x86/o/Gesture
 GoodCitizen/arm/o.le-v7-g/GoodCitizen
 GoodCitizen/arm/o.le-v7/GoodCitizen
 GoodCitizen/x86/o-g/GoodCitizen
-GoodCitizen/x86/o/GoodCitizen
 HelloWorldConsole/arm/o.le-v7-g/HelloWorldConsole
 HelloWorldConsole/arm/o.le-v7/HelloWorldConsole
 HelloWorldConsole/x86/o-g/HelloWorldConsole
-HelloWorldConsole/x86/o/HelloWorldConsole
 HelloWorldDisplay/arm/o.le-v7-g/HelloWorldDisplay
 HelloWorldDisplay/arm/o.le-v7/HelloWorldDisplay
 HelloWorldDisplay/x86/o-g/HelloWorldDisplay
-HelloWorldDisplay/x86/o/HelloWorldDisplay
 HttpProxy/arm/o.le-v7-g/HttpProxy
 HttpProxy/arm/o.le-v7/HttpProxy
 HttpProxy/x86/o-g/HttpProxy
-HttpProxy/x86/o/HttpProxy
 Keyboard/arm/o.le-v7-g/Keyboard
 Keyboard/arm/o.le-v7/Keyboard
 Keyboard/x86/o-g/Keyboard
-Keyboard/x86/o/Keyboard
 LocaleSample/arm/o.le-v7-g/LocaleSample
 LocaleSample/arm/o.le-v7/LocaleSample
 LocaleSample/x86/o-g/LocaleSample
-LocaleSample/x86/o/LocaleSample
 NetworkStatus/arm/o.le-v7-g/NetworkStatus
 NetworkStatus/arm/o.le-v7/NetworkStatus
 NetworkStatus/x86/o-g/NetworkStatus
-NetworkStatus/x86/o/NetworkStatus
 PaymentService/arm/o.le-v7-g/PaymentService
 PaymentService/arm/o.le-v7/PaymentService
 PaymentService/x86/o-g/PaymentService
-PaymentService/x86/o/PaymentService
 PlayAudio/arm/o.le-v7-g/PlayAudio
 PlayAudio/arm/o.le-v7/PlayAudio
 PlayAudio/x86/o-g/PlayAudio
-PlayAudio/x86/o/PlayAudio
 PlayWav/arm/o.le-v7-g/PlayWav
 PlayWav/arm/o.le-v7/PlayWav
 PlayWav/x86/o-g/PlayWav
-PlayWav/x86/o/PlayWav
 ScreenTemplate/arm/o.le-v7-g/ScreenTemplate
 ScreenTemplate/arm/o.le-v7/ScreenTemplate
 ScreenTemplate/x86/o-g/ScreenTemplate
-ScreenTemplate/x86/o/ScreenTemplate
 VideoPlayback/arm/o.le-v7-g/VideoPlayback
 VideoPlayback/arm/o.le-v7/VideoPlayback
 VideoPlayback/x86/o-g/VideoPlayback
-VideoPlayback/x86/o/VideoPlayback
 VideoWindow/arm/o.le-v7-g/VideoWindow
 VideoWindow/arm/o.le-v7/VideoWindow
 VideoWindow/x86/o-g/VideoWindow

Accelerometer/bar-descriptor.xml

@@ -6,83 +6,84 @@
     Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS.
 -->
 
-    <!-- A universally unique application identifier. Must be unique across all BlackBerry® 10 applications.
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry applications.
          Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
     <id>com.example.Accelerometer</id>
 
-    <!-- The name that is displayed in the BlackBerry® 10 application installer.
+    <!-- The name that is displayed in the BlackBerry application installer. 
          May have multiple values for each language. See samples or xsd schema file. Optional. -->
     <name>Accelerometer</name>
-
-    <!-- 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.
+    
+    <!-- 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>
 
-    <!-- Fourth digit segment of the package version. First three segments are taken from the
+    <!-- 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 -->
     <buildId>1</buildId>
-
-    <!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
-    <!-- <versionLabel></versionLabel> -->
-
-    <!-- Description, displayed in the BlackBerry® 10 application installer.
+
+    <!-- Description, displayed in the BlackBerry application installer.
          May have multiple values for each language. See samples or xsd schema file. Optional. -->
     <description>The Accelerometer application</description>
 
-    <!-- Copyright information. Optional. -->
-    <!-- <copyright></copyright> -->
-
     <!--  Name of author which is used for signing. Must match the developer name of your development certificate. -->
     <author>Example Inc.</author>
-    <splashScreens>sample-splashscreen-landscape.png:sample-splashscreen-portrait.png</splashScreens>
-
+
     <!--  Unique author ID assigned by signing authority. Required if using debug tokens. -->
     <!-- <authorId>ABC1234YjsnUk235h</authorId> -->
-
+   
     <initialWindow>
         <aspectRatio>portrait</aspectRatio>
         <autoOrients>false</autoOrients>
         <systemChrome>none</systemChrome>
         <transparent>false</transparent>
     </initialWindow>
-
+    
     <!--  The category where the application appears. Either core.games or core.media. -->
     <category>core.games</category>
     <asset path="icon.png">icon.png</asset>
-    <asset path="sample-splashscreen-landscape.png">sample-splashscreen-landscape.png</asset>
-    <asset path="sample-splashscreen-portrait.png">sample-splashscreen-portrait.png</asset>
     <asset path="LICENSE">LICENSE</asset>
     <asset path="NOTICE">NOTICE</asset>
-    <configuration id="com.qnx.qcc.toolChain.1459378934" name="Default">
+    <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm/o.le-v7-g/Accelerometer" entry="true" type="Qnx/Elf">Accelerometer</asset>
     </configuration>
-    <configuration id="com.qnx.qcc.toolChain.952011436" name="Device-Debug">
-       <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="arm/o.le-v7-g/Accelerometer" entry="true" type="Qnx/Elf">Accelerometer</asset>
-    </configuration>
-    <configuration id="com.qnx.qcc.toolChain.1368321402" name="Device-Release">
+    <configuration name="Device-Release">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm/o.le-v7/Accelerometer" entry="true" type="Qnx/Elf">Accelerometer</asset>
     </configuration>
-    <configuration id="com.qnx.qcc.toolChain.1246487324" name="Simulator-Debug">
+    <configuration name="Simulator-Debug">
        <platformArchitecture>x86</platformArchitecture>
        <asset path="x86/o-g/Accelerometer" entry="true" type="Qnx/Elf">Accelerometer</asset>
     </configuration>
-
-    <!--  The icon for the application, which should be 86x86. -->
+    
+    <!--  The icon for the application. -->
     <icon>
        <image>icon.png</image>
     </icon>
-
-    <!--  The splash screen that will appear when your application is launching. Should be 1024x600. -->
+    
+    <!--  The splash screen that will appear when your application is launching. -->
     <!-- <splashscreen></splashscreen> -->
 
     <!-- Request permission to execute native code.  Required for native applications. -->
     <permission system="true">run_native</permission>
+
+    <!--  The permissions requested by your application. -->
+    <!--  <permission>access_shared</permission> -->
+    <!--  <permission>record_audio</permission> -->
+    <!--  <permission>read_geolocation</permission> -->
+    <!--  <permission>use_camera</permission> -->
+    <!--  <permission>access_internet</permission> -->
+    <!--  <permission>play_audio</permission> -->
+    <!--  <permission>post_notification</permission> -->
+    <!--  <permission>set_audio_volume</permission> -->
+    <!--  <permission>read_device_identifying_information</permission> -->
+    <!--  <permission>access_led_control</permission> -->
+    <!--  <permission>run_when_backgrounded</permission> -->
+
 
     <!-- Ensure that shared libraries in the package are found at run-time. -->
     <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
+    
 </qnx>

Accelerometer/common.mk

@@ -5,29 +5,30 @@ include $(QCONFIG)
 
 USEFILE=
 
-include $(MKFILES_ROOT)/qmacros.mk
-
-# Suppress the _g suffix from the debug variant
-BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
-
-# Extra include path libfreetype and for target overrides and patches
+# Extra include path for libfreetype and for target overrides and patches
 EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \
 	$(QNX_TARGET)/../target-override/usr/include
 
 # Extra library search path for target overrides and patches
 EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \
 	$(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib
 
-# Compiler options for enhanced security
-CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \
-	$(if $(filter g so shared,$(VARIANTS)),,-fPIE)
+# Compiler options for enhanced security and recording the compiler options in release builds
+CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \
+	$(if $(filter g so shared,$(VARIANTS)),,-fPIE) \
+	$(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches)
 
 # Linker options for enhanced security
 LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie)
 
-# Basic libraries required by most native applications
+# Add your required library names, here
 LIBS+=bps screen m
 
+include $(MKFILES_ROOT)/qmacros.mk
+
+# Suppress the _g suffix from the debug variant
+BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
+
 include $(MKFILES_ROOT)/qtargets.mk
 
 OPTIMIZE_TYPE_g=none

Accelerometer/manifest.properties

@@ -9,8 +9,6 @@
 #   project.name         - [required] The name of the example project that is created
 #   icon                 - [optional] The icon file to generate and list in the bar-descriptor.xml.
 #                          Should be named "icon.png"
-#   splashscreen.landscape - [optional] The landscape splashscreen image.
-#   splashscreen.portrait  - [optional] The portrait splashscreen image.
 #   actions              - [optional] Space-delimited list of the permissions required (actions performed)
 #                          by the application.  The "run_native" action is implicit.
 #   open.file            - [Optional] The file to open in an editor when the project creation
@@ -40,16 +38,14 @@ template.description: Create a new BlackBerry
 project.name: Accelerometer
 
 icon: icon.png
-splashscreen.landscape: sample-splashscreen-landscape.png
-splashscreen.portrait: sample-splashscreen-portrait.png
 
 open.file: bar-descriptor.xml
 
 libs: bps screen m
 
 sources: main.c dialogutil.c dialogutil.h
 
-resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png
+resources: LICENSE NOTICE
 
 readmes: readme.txt