kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure Android project to match Gradle's guidelines.

Browse Source
This commit is contained in:
player-03
2016-05-24 04:21:40 -04:00
committed by Joshua Granick
parent a4a27a2edc
commit 7beca72f18
6 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lime/tools/platforms/AndroidPlatform.hx
View File

@@ -76,7 +76,7 @@ class AndroidPlatform extends PlatformTarget {
var haxeParams = [ hxml, "-D", "android", "-D", "android-9" ]; var haxeParams = [ hxml, "-D", "android", "-D", "android-9" ];
var cppParams = [ "-Dandroid", "-Dandroid-9" ]; var cppParams = [ "-Dandroid", "-Dandroid-9" ];
var path = targetDirectory + "/bin/libs/armeabi"; var path = sourceSet + "/jniLibs/armeabi";
var suffix = ".so"; var suffix = ".so";
if (architecture == Architecture.ARMV7) { if (architecture == Architecture.ARMV7) {
@@ -87,7 +87,7 @@ class AndroidPlatform extends PlatformTarget {
if (hasARMV5) { if (hasARMV5) {
path = targetDirectory + "/bin/libs/armeabi-v7"; path = sourceSet + "/jniLibs/armeabi-v7";
} }
@@ -98,7 +98,7 @@ class AndroidPlatform extends PlatformTarget {
haxeParams.push ("-D"); haxeParams.push ("-D");
haxeParams.push ("HXCPP_X86"); haxeParams.push ("HXCPP_X86");
cppParams.push ("-DHXCPP_X86"); cppParams.push ("-DHXCPP_X86");
path = targetDirectory + "/bin/libs/x86"; path = sourceSet + "/jniLibs/x86";
suffix = "-x86.so"; suffix = "-x86.so";
} }
@@ -118,9 +118,9 @@ class AndroidPlatform extends PlatformTarget {
if (!ArrayHelper.containsValue (project.architectures, Architecture.ARMV7) || !hasARMV5) { if (!ArrayHelper.containsValue (project.architectures, Architecture.ARMV7) || !hasARMV5) {
if (FileSystem.exists (targetDirectory + "/bin/libs/armeabi-v7")) { if (FileSystem.exists (sourceSet + "/jniLibs/armeabi-v7")) {
PathHelper.removeDirectory (targetDirectory + "/bin/libs/armeabi-v7"); PathHelper.removeDirectory (sourceSet + "/jniLibs/armeabi-v7");
} }
@@ -128,9 +128,9 @@ class AndroidPlatform extends PlatformTarget {
if (!hasX86) { if (!hasX86) {
if (FileSystem.exists (targetDirectory + "/bin/libs/x86")) { if (FileSystem.exists (sourceSet + "/jniLibs/x86")) {
PathHelper.removeDirectory (targetDirectory + "/bin/libs/x86"); PathHelper.removeDirectory (sourceSet + "/jniLibs/x86");
} }
@@ -185,7 +185,7 @@ class AndroidPlatform extends PlatformTarget {
} }
deviceID = AndroidHelper.install (project, FileSystem.fullPath (targetDirectory) + "/bin/bin/" + project.app.file + "-" + build + ".apk", deviceID); deviceID = AndroidHelper.install (project, FileSystem.fullPath (targetDirectory) + "/bin/app/build/outputs/apk/" + project.app.file + "-" + build + ".apk", deviceID);
} }
@@ -247,12 +247,13 @@ class AndroidPlatform extends PlatformTarget {
//initialize (project); //initialize (project);
var destination = targetDirectory + "/bin/"; var destination = targetDirectory + "/bin";
PathHelper.mkdir (destination); var sourceSet = destination + "/app/src/main";
PathHelper.mkdir (destination + "/res/drawable-ldpi/"); PathHelper.mkdir (sourceSet);
PathHelper.mkdir (destination + "/res/drawable-mdpi/"); PathHelper.mkdir (sourceSet + "/res/drawable-ldpi/");
PathHelper.mkdir (destination + "/res/drawable-hdpi/"); PathHelper.mkdir (sourceSet + "/res/drawable-mdpi/");
PathHelper.mkdir (destination + "/res/drawable-xhdpi/"); PathHelper.mkdir (sourceSet + "/res/drawable-hdpi/");
PathHelper.mkdir (sourceSet + "/res/drawable-xhdpi/");
for (asset in project.assets) { for (asset in project.assets) {
@@ -269,15 +270,15 @@ class AndroidPlatform extends PlatformTarget {
//asset.flatName += ((extension != "") ? "." + extension : ""); //asset.flatName += ((extension != "") ? "." + extension : "");
//asset.resourceName = asset.flatName; //asset.resourceName = asset.flatName;
targetPath = PathHelper.combine (destination + "/assets/", asset.resourceName); targetPath = PathHelper.combine (sourceSet + "/assets/", asset.resourceName);
//asset.resourceName = asset.id; //asset.resourceName = asset.id;
//targetPath = destination + "/res/raw/" + asset.flatName + "." + Path.extension (asset.targetPath); //targetPath = sourceSet + "/res/raw/" + asset.flatName + "." + Path.extension (asset.targetPath);
//default: //default:
//asset.resourceName = asset.flatName; //asset.resourceName = asset.flatName;
//targetPath = destination + "/assets/" + asset.resourceName; //targetPath = sourceSet + "/assets/" + asset.resourceName;
} }
@@ -338,7 +339,7 @@ class AndroidPlatform extends PlatformTarget {
for (i in 0...iconTypes.length) { for (i in 0...iconTypes.length) {
if (IconHelper.createIcon (icons, iconSizes[i], iconSizes[i], destination + "/res/drawable-" + iconTypes[i] + "/icon.png")) { if (IconHelper.createIcon (icons, iconSizes[i], iconSizes[i], sourceSet + "/res/drawable-" + iconTypes[i] + "/icon.png")) {
context.HAS_ICON = true; context.HAS_ICON = true;
@@ -346,10 +347,10 @@ class AndroidPlatform extends PlatformTarget {
} }
IconHelper.createIcon (icons, 732, 412, destination + "/res/drawable-xhdpi/ouya_icon.png"); IconHelper.createIcon (icons, 732, 412, sourceSet + "/res/drawable-xhdpi/ouya_icon.png");
var packageDirectory = project.meta.packageName; var packageDirectory = project.meta.packageName;
packageDirectory = destination + "/src/" + packageDirectory.split (".").join ("/"); packageDirectory = sourceSet + "/java/" + packageDirectory.split (".").join ("/");
PathHelper.mkdir (packageDirectory); PathHelper.mkdir (packageDirectory);
for (javaPath in project.javaPaths) { for (javaPath in project.javaPaths) {
@@ -358,17 +359,17 @@ class AndroidPlatform extends PlatformTarget {
if (FileSystem.isDirectory (javaPath)) { if (FileSystem.isDirectory (javaPath)) {
FileHelper.recursiveCopy (javaPath, destination + "/src", context, true); FileHelper.recursiveCopy (javaPath, sourceSet + "/src", context, true);
} else { } else {
if (Path.extension (javaPath) == "jar") { if (Path.extension (javaPath) == "jar") {
FileHelper.copyIfNewer (javaPath, destination + "/libs/" + Path.withoutDirectory (javaPath)); FileHelper.copyIfNewer (javaPath, destination + "/app/libs/" + Path.withoutDirectory (javaPath));
} else { } else {
FileHelper.copyIfNewer (javaPath, destination + "/src/" + Path.withoutDirectory (javaPath)); FileHelper.copyIfNewer (javaPath, sourceSet + "/src/" + Path.withoutDirectory (javaPath));
} }
@@ -384,7 +385,7 @@ class AndroidPlatform extends PlatformTarget {
for (library in context.ANDROID_LIBRARY_PROJECTS) { for (library in context.ANDROID_LIBRARY_PROJECTS) {
FileHelper.recursiveCopy (library.source, destination + "/deps/" + library.name, context, true); FileHelper.recursiveCopy (library.source, sourceSet + "/deps/" + library.name, context, true);
} }
@@ -397,7 +398,7 @@ class AndroidPlatform extends PlatformTarget {
if (asset.type == AssetType.TEMPLATE) { if (asset.type == AssetType.TEMPLATE) {
var targetPath = PathHelper.combine (destination, asset.targetPath); var targetPath = PathHelper.combine (sourceSet, asset.targetPath);
PathHelper.mkdir (Path.directory (targetPath)); PathHelper.mkdir (Path.directory (targetPath));
FileHelper.copyAsset (asset, targetPath, context); FileHelper.copyAsset (asset, targetPath, context);
@@ -405,7 +406,7 @@ class AndroidPlatform extends PlatformTarget {
} }
AssetHelper.createManifest (project, destination + "/assets/manifest"); AssetHelper.createManifest (project, sourceSet + "/assets/manifest");
} }

0
templates/android/template/AndroidManifest.xml → templates/android/template/app/src/main/AndroidManifest.xml
View File

0
templates/android/template/src/org/haxe/lime/GameActivity.java → templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java
View File

0
templates/android/template/src/org/libsdl/app/SDLActivity.java → templates/android/template/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

0
templates/android/template/libs/armeabi/readme.txt → templates/android/template/app/src/main/jniLibs/armeabi/readme.txt
View File

23
templates/android/template/project.properties
View File

@@ -1,23 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# project structure.
manifestmerger.enabled=true
::if (ANDROID_LIBRARY_PROJECTS)::::foreach (ANDROID_LIBRARY_PROJECTS)::
android.library.reference.::index::=::path::::end::::end::
# Project target.
target=android-::ANDROID_TARGET_SDK_VERSION::
::if (KEY_STORE)::
key.store=::KEY_STORE::
::if (KEY_STORE_ALIAS)::key.alias=::KEY_STORE_ALIAS::::end::
::if (KEY_STORE_PASSWORD)::key.store.password=::KEY_STORE_PASSWORD::::end::
::if (KEY_STORE_ALIAS_PASSWORD)::key.alias.password=::KEY_STORE_ALIAS_PASSWORD::::end::
::end::