Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-03-29 15:35:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove build variants because they are confusing and incompatible with CLI ant builds which I still want to maintain

Browse Source
This commit is contained in:
Aaron Culliney 2015-09-05 13:52:26 -07:00
parent d7ae39b2a8
commit c3702c54b5
13 changed files with 26 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/AndroidManifest.xml
View File

@ -1 +1 @@
app/build/intermediates/manifests/full/demo/debug/AndroidManifest.xml
app/build/intermediates/manifests/full/debug/AndroidManifest.xml

65
Android/app/app.iml
View File

@ -8,62 +8,41 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="demoDebug" />
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDemoDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDemoDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDemoDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDemoDebugAndroidTestSources" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDemoDebugAndroidTestSources</task>
<task>generateDemoDebugSources</task>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/demo/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/demo/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/demo/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/demo/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/demo/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/demo/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/demo/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/demo/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/demo/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demoDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/demo/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/demo/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/demo/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/demo/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/demo/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/demo/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/demo/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDemo/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

14
Android/app/build.gradle
View File

@ -24,25 +24,15 @@ android {
}
defaultConfig {
applicationId "org.deadc0de.apple2ix"
applicationId "org.deadc0de.apple2ix.basic"
minSdkVersion 10
targetSdkVersion 23
versionCode 1
versionName "0.9.1"
versionName "0.9.2"
ndk {
moduleName "apple2ix"
}
}
productFlavors {
demo {
applicationId "org.deadc0de.apple2ix.demo"
versionName "0.9.1-demo"
}
full {
applicationId "org.deadc0de.apple2ix.full"
versionName "0.9.1-full"
}
}
}
dependencies {

40
Android/app/src/demo/java/org/deadc0de/apple2ix/SecondActivity.java
View File

@ -1,40 +0,0 @@
package org.deadc0de.apple2ix;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import org.deadc0de.apple2ix.R;
public class SecondActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_second);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(0/*R.menu.menu_second*/, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item cli cks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == 0/*R.id.action_settings*/) {
return true;
}
return super.onOptionsItemSelected(item);
}
}

12
Android/app/src/demo/res/layout/activity_second.xml
View File

@ -1,12 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.deadc0de.apple2ix.SecondActivity">
<TextView android:text="hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>

6
Android/app/src/demo/res/values/strings.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Apple2ix Demo</string>
</resources>

7
Android/app/src/full/AndroidManifest.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.deadc0de.apple2ix" >
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

40
Android/app/src/full/java/org/deadc0de/apple2ix/SecondActivity.java
View File

@ -1,40 +0,0 @@
package org.deadc0de.apple2ix;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import org.deadc0de.apple2ix.R;
public class SecondActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_second);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(0/*R.menu.menu_second*/, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == 0/*R.id.action_settings*/) {
return true;
}
return super.onOptionsItemSelected(item);
}
}

12
Android/app/src/full/res/layout/activity_second.xml
View File

@ -1,12 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.deadc0de.apple2ix.SecondActivity">
<TextView android:text="hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>

6
Android/app/src/full/res/values/strings.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Apple2ix Full</string>
</resources>

4
Android/app/src/main/AndroidManifest.xml
View File

@ -27,10 +27,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SecondActivity"
android:label="@string/title_activity_second" >
</activity>
</application>
</manifest>

1
Android/app/src/main/res/values/strings.xml
View File

@ -162,7 +162,6 @@
<string name="settings_advanced_joystick_summary">Advanced settings and performance tuning</string>
<string name="tab_general">General</string>
<string name="tab_joystick">Joystick</string>
<string name="title_activity_second">SecondActivity</string>
<string name="touch_menu_enable">Enable touch menus</string>
<string name="touch_menu_enable_summary">Enables soft menu buttons in top screen corners</string>
<string name="touch_menu_visibility">Touch menu visibility</string>

2
Android/jni/jnihooks.c
View File

@ -235,7 +235,7 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnQuit(JNIEnv *env, jobject
void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnUncaughtException(JNIEnv *env, jobject obj, jstring jhome, jstring jstr) {
RELEASE_ERRLOG("Uncaught Java Exception ...");
// Write to /data/data/org.deadc0de.apple2ix.demo/jcrash.txt
// Write to /data/data/org.deadc0de.apple2ix.basic/jcrash.txt
const char *home = (*env)->GetStringUTFChars(env, jhome, NULL);
char *q = (char *)home;
char buf[_HALF_PAGE_SIZE] = { 0 };