Browse Source

Introjucer: added Android version number

tags/2021-05-28
jules 10 years ago
parent
commit
a1dfafe2c8
2 changed files with 11 additions and 2 deletions
  1. +10
    -2
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
  2. +1
    -0
      extras/Introjucer/Source/Utility/jucer_PresetIDs.h

+ 10
- 2
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h View File

@@ -45,6 +45,9 @@ public:
if (getTargetLocationString().isEmpty()) if (getTargetLocationString().isEmpty())
getTargetLocationValue() = getDefaultBuildsRootFolder() + "Android"; getTargetLocationValue() = getDefaultBuildsRootFolder() + "Android";
if (getVersionCodeString().isEmpty())
getVersionCodeValue() = 1;
if (getActivityClassPath().isEmpty()) if (getActivityClassPath().isEmpty())
getActivityClassPathValue() = createDefaultClassName(); getActivityClassPathValue() = createDefaultClassName();
@@ -76,6 +79,9 @@ public:
props.add (new TextPropertyComponent (getActivityClassPathValue(), "Android Activity class name", 256, false), props.add (new TextPropertyComponent (getActivityClassPathValue(), "Android Activity class name", 256, false),
"The full java class name to use for the app's Activity class."); "The full java class name to use for the app's Activity class.");
props.add (new TextPropertyComponent (getVersionCodeValue(), "Android Version Code", 32, false),
"An integer value that represents the version of the application code, relative to other versions.");
props.add (new TextPropertyComponent (getSDKPathValue(), "Android SDK Path", 1024, false), props.add (new TextPropertyComponent (getSDKPathValue(), "Android SDK Path", 1024, false),
"The path to the Android SDK folder on the target build machine"); "The path to the Android SDK folder on the target build machine");
@@ -121,6 +127,8 @@ public:
Value getActivityClassPathValue() { return getSetting (Ids::androidActivityClass); } Value getActivityClassPathValue() { return getSetting (Ids::androidActivityClass); }
String getActivityClassPath() const { return settings [Ids::androidActivityClass]; } String getActivityClassPath() const { return settings [Ids::androidActivityClass]; }
Value getVersionCodeValue() { return getSetting (Ids::androidVersionCode); }
String getVersionCodeString() const { return settings [Ids::androidVersionCode]; }
Value getSDKPathValue() { return getSetting (Ids::androidSDKPath); } Value getSDKPathValue() { return getSetting (Ids::androidSDKPath); }
String getSDKPathString() const { return settings [Ids::androidSDKPath]; } String getSDKPathString() const { return settings [Ids::androidSDKPath]; }
Value getNDKPathValue() { return getSetting (Ids::androidNDKPath); } Value getNDKPathValue() { return getSetting (Ids::androidNDKPath); }
@@ -262,8 +270,8 @@ private:
XmlElement* manifest = new XmlElement ("manifest"); XmlElement* manifest = new XmlElement ("manifest");
manifest->setAttribute ("xmlns:android", "http://schemas.android.com/apk/res/android"); manifest->setAttribute ("xmlns:android", "http://schemas.android.com/apk/res/android");
manifest->setAttribute ("android:versionCode", "1");
manifest->setAttribute ("android:versionName", "1.0");
manifest->setAttribute ("android:versionCode", getVersionCodeString());
manifest->setAttribute ("android:versionName", project.getVersionString());
manifest->setAttribute ("package", getActivityClassPackage()); manifest->setAttribute ("package", getActivityClassPackage());
XmlElement* screens = manifest->createNewChildElement ("supports-screens"); XmlElement* screens = manifest->createNewChildElement ("supports-screens");


+ 1
- 0
extras/Introjucer/Source/Utility/jucer_PresetIDs.h View File

@@ -129,6 +129,7 @@ namespace Ids
DECLARE_ID (showAllCode); DECLARE_ID (showAllCode);
DECLARE_ID (useLocalCopy); DECLARE_ID (useLocalCopy);
DECLARE_ID (androidActivityClass); DECLARE_ID (androidActivityClass);
DECLARE_ID (androidVersionCode);
DECLARE_ID (androidSDKPath); DECLARE_ID (androidSDKPath);
DECLARE_ID (androidNDKPath); DECLARE_ID (androidNDKPath);
DECLARE_ID (androidInternetNeeded); DECLARE_ID (androidInternetNeeded);


Loading…
Cancel
Save