Skip to content

Commit

Permalink
Merge pull request #142 from CodeHoarder/master
Browse files Browse the repository at this point in the history 
removed deprecated id attribute in bar-descriptor and enabled parallel b...
  • Loading branch information
@pelegri
pelegri committed Sep 3, 2013
2 parents 449d610 + c78808e commit fe77eb4
Show file tree
Hide file tree
Showing 121 changed files with 2,062 additions and 1,040 deletions.
24 changes: 19 additions & 5 deletions SensorDemo/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" id="com.qnx.qcc.toolChain.1914788226" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.1914788226" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.qnx.qcc.toolChain.1914788226.1567637013" name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.268032704" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain">
<option id="com.qnx.qcc.option.os.614796125" name="Target OS:" superClass="com.qnx.qcc.option.os"/>
<option id="com.qnx.qcc.option.cpu.1104539411" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.1463820271" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/>
<option id="com.qnx.qcc.option.runtime.2088679195" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/>
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.808042757" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.1914788226.219412183" incrementalBuildTarget="Device-Debug" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.1914788226.219412183" incrementalBuildTarget="Device-Debug" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="com.qnx.qcc.tool.compiler.317211679" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compiler.optlevel.279694322" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.243892497" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<option id="com.qnx.qcc.option.compiler.optlevel.279694322" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.243892497" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4/QtCore"/>
Expand Down Expand Up @@ -206,5 +206,19 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/SensorDemo"/>
</configuration>
<configuration configurationName="Device-Debug">
<resource resourceType="PROJECT" workspacePath="/SensorDemo"/>
</configuration>
<configuration configurationName="Simulator-Debug">
<resource resourceType="PROJECT" workspacePath="/SensorDemo"/>
</configuration>
<configuration configurationName="Device-Release">
<resource resourceType="PROJECT" workspacePath="/SensorDemo"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>
8 changes: 4 additions & 4 deletions SensorDemo/bar-descriptor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@

<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<configuration id="com.qnx.qcc.toolChain.1914788226" name="Default">
<configuration name="Default">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/SensorDemo" entry="true" type="Qnx/Elf">SensorDemo</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.476274684" name="Device-Debug">
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/SensorDemo" entry="true" type="Qnx/Elf">SensorDemo</asset>
<entryPointType>Qnx/Elf</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1999582179" name="Device-Release">
<configuration name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7/libSensorDemo.so.1.0.0" entry="true" type="Qnx/Elf">SensorDemo.so</asset>
<entryPointType>Qnx/Cascades</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1067285528" name="Simulator-Debug">
<configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/SensorDemo" entry="true" type="Qnx/Elf">SensorDemo</asset>
</configuration>
Expand Down
24 changes: 19 additions & 5 deletions accelgame/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" id="com.qnx.qcc.toolChain.121660429" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.121660429" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.qnx.qcc.toolChain.121660429.2051027400" name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.2117155280" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain">
<option id="com.qnx.qcc.option.os.84785580" name="Target OS:" superClass="com.qnx.qcc.option.os"/>
<option id="com.qnx.qcc.option.cpu.104498838" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.2090989542" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/>
<option id="com.qnx.qcc.option.runtime.273503072" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/>
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.641293603" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.121660429.538599038" incrementalBuildTarget="Device-Debug" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.121660429.538599038" incrementalBuildTarget="Device-Debug" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="com.qnx.qcc.tool.compiler.1967070967" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compiler.optlevel.2031184961" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.383443625" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<option id="com.qnx.qcc.option.compiler.optlevel.2031184961" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.383443625" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4/QtCore"/>
Expand Down Expand Up @@ -206,5 +206,19 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/accelgame"/>
</configuration>
<configuration configurationName="Device-Debug">
<resource resourceType="PROJECT" workspacePath="/accelgame"/>
</configuration>
<configuration configurationName="Simulator-Debug">
<resource resourceType="PROJECT" workspacePath="/accelgame"/>
</configuration>
<configuration configurationName="Device-Release">
<resource resourceType="PROJECT" workspacePath="/accelgame"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>
8 changes: 4 additions & 4 deletions accelgame/bar-descriptor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@

<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<configuration id="com.qnx.qcc.toolChain.121660429" name="Default">
<configuration name="Default">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/accelgame" entry="true" type="Qnx/Elf">accelgame</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1799526570" name="Device-Debug">
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/accelgame" entry="true" type="Qnx/Elf">accelgame</asset>
<entryPointType>Qnx/Elf</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1459568978" name="Device-Release">
<configuration name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7/libaccelgame.so.1.0.0" entry="true" type="Qnx/Elf">accelgame.so</asset>
<entryPointType>Qnx/Cascades</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1602364756" name="Simulator-Debug">
<configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/accelgame" entry="true" type="Qnx/Elf">accelgame</asset>
</configuration>
Expand Down
24 changes: 19 additions & 5 deletions accounts/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" id="com.qnx.qcc.toolChain.1906702220" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<configuration artifactName="${ProjName}" buildProperties="" description="" id="com.qnx.qcc.toolChain.1906702220" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="com.qnx.qcc.toolChain.1906702220.776915301" name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.376059486" name="com.qnx.qcc.toolChain" superClass="com.qnx.qcc.toolChain">
<option id="com.qnx.qcc.option.os.1437957039" name="Target OS:" superClass="com.qnx.qcc.option.os"/>
<option id="com.qnx.qcc.option.cpu.1977653318" name="Target CPU:" superClass="com.qnx.qcc.option.cpu" value="com.qnx.qcc.option.gen.cpu.armle-v7" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.169254905" name="Compiler:" superClass="com.qnx.qcc.option.compiler"/>
<option id="com.qnx.qcc.option.runtime.358617364" name="Runtime:" superClass="com.qnx.qcc.option.runtime"/>
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.1540397301" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.1906702220.1814902976" incrementalBuildTarget="Device-Debug" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<builder autoBuildTarget="Device-Debug" enableAutoBuild="true" id="com.qnx.qcc.toolChain.1906702220.1814902976" incrementalBuildTarget="Device-Debug" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="com.qnx.qcc.tool.compiler.534633454" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
<option id="com.qnx.qcc.option.compiler.optlevel.391021071" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.1582637385" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<option id="com.qnx.qcc.option.compiler.optlevel.391021071" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
<option id="com.qnx.qcc.option.compiler.includePath.1582637385" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/qt4/QtCore"/>
Expand Down Expand Up @@ -206,5 +206,19 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/accounts"/>
</configuration>
<configuration configurationName="Device-Debug">
<resource resourceType="PROJECT" workspacePath="/accounts"/>
</configuration>
<configuration configurationName="Simulator-Debug">
<resource resourceType="PROJECT" workspacePath="/accounts"/>
</configuration>
<configuration configurationName="Device-Release">
<resource resourceType="PROJECT" workspacePath="/accounts"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>
8 changes: 4 additions & 4 deletions accounts/bar-descriptor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@

<!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
<configuration id="com.qnx.qcc.toolChain.1906702220" name="Default">
<configuration name="Default">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/accounts" entry="true" type="Qnx/Elf">accounts</asset>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1719883196" name="Device-Debug">
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7-g/accounts" entry="true" type="Qnx/Elf">accounts</asset>
<entryPointType>Qnx/Elf</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1377699660" name="Device-Release">
<configuration name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="arm/o.le-v7/libaccounts.so.1.0.0" entry="true" type="Qnx/Elf">accounts.so</asset>
<entryPointType>Qnx/Cascades</entryPointType>
</configuration>
<configuration id="com.qnx.qcc.toolChain.1497917278" name="Simulator-Debug">
<configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/accounts" entry="true" type="Qnx/Elf">accounts</asset>
</configuration>
Expand Down
Loading

0 comments on commit fe77eb4

Please sign in to comment.