eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

more android tweaks for new sdk, things now working again

Browse Source
This commit is contained in:
benfry
2009-12-06 18:54:51 +00:00
parent b762d4c2b5
commit d9499ce009
4 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/tools/android/Android.java
+28 -3
View File
@@ -65,7 +65,7 @@ public class Android implements Tool {
static final String ADB_SOCKET_PORT = "29892";
static final String ANDROID_CORE_URL =
"http://dev.processing.org/android/core.zip";
"http://dev.processing.org/processing/android/core.zip";
static final String ANDROID_CORE_FILENAME =
"processing-android-core.zip";
@@ -195,10 +195,35 @@ public class Android implements Tool {
*/
return true;
}
static protected File getCoreZipFile() {
// for debugging only, check to see if this is an svn checkout
File debugFile = new File("../../../android/core.zip");
if (!debugFile.exists() && Base.isMacOS()) {
// current path might be inside Processing.app, so need to go much higher
debugFile = new File("../../../../../../../android/core.zip");
}
if (debugFile.exists()) {
System.out.println("Using version of core.zip from local SVN checkout.");
return debugFile;
// } else {
// //System.out.println("no core.zip at " + debugFile.getAbsolutePath());
// try {
// System.out.println("no core.zip at " + debugFile.getCanonicalPath());
// } catch (IOException e) {
// e.printStackTrace();
// }
}
// otherwise do the usual
return new File(Base.getSketchbookFolder(), ANDROID_CORE_FILENAME);
}
protected boolean checkCore() {
File target = new File(Base.getSketchbookFolder(), ANDROID_CORE_FILENAME);
//File target = new File(Base.getSketchbookFolder(), ANDROID_CORE_FILENAME);
File target = getCoreZipFile();
if (!target.exists()) {
try {
URL url = new URL(ANDROID_CORE_URL);
@@ -756,7 +781,7 @@ public class Android implements Tool {
System.out.println("creating runner");
//System.out.println("editor from Android is " + editor);
AndroidRunner ar = new AndroidRunner(editor, editor.getSketch());
System.out.println("launching vm");
// System.out.println("launching vm");
return ar.launch(ADB_SOCKET_PORT);
//System.out.println("vm launched");
app/src/processing/app/tools/android/Build.java
+13 -9
View File
@@ -422,11 +422,16 @@ public class Build {
writer.println(" <property file=\"default.properties\"/>");
writer.println(" <path id=\"android.antlibs\">");
writer.println(" <pathelement path=\"${sdk-location}/tools/lib/anttasks.jar\" />");
writer.println(" <pathelement path=\"${sdk-location}/tools/lib/sdklib.jar\" />");
writer.println(" <pathelement path=\"${sdk-location}/tools/lib/androidprefs.jar\" />");
writer.println(" <pathelement path=\"${sdk-location}/tools/lib/apkbuilder.jar\" />");
writer.println(" <pathelement path=\"${sdk-location}/tools/lib/jarutils.jar\" />");
// writer.println(" <pathelement path=\"${sdk-location}/tools/lib/anttasks.jar\" />");
// writer.println(" <pathelement path=\"${sdk-location}/tools/lib/sdklib.jar\" />");
// writer.println(" <pathelement path=\"${sdk-location}/tools/lib/androidprefs.jar\" />");
// writer.println(" <pathelement path=\"${sdk-location}/tools/lib/apkbuilder.jar\" />");
// writer.println(" <pathelement path=\"${sdk-location}/tools/lib/jarutils.jar\" />");
writer.println(" <pathelement path=\"${sdk.dir}/tools/lib/anttasks.jar\" />");
writer.println(" <pathelement path=\"${sdk.dir}/tools/lib/sdklib.jar\" />");
writer.println(" <pathelement path=\"${sdk.dir}/tools/lib/androidprefs.jar\" />");
writer.println(" <pathelement path=\"${sdk.dir}/tools/lib/apkbuilder.jar\" />");
writer.println(" <pathelement path=\"${sdk.dir}/tools/lib/jarutils.jar\" />");
writer.println(" </path>");
writer.println(" <taskdef name=\"setup\"");
@@ -466,7 +471,8 @@ public class Build {
void writeLocalProps(File file) {
PrintWriter writer = PApplet.createWriter(file);
writer.println("sdk-location=" + Android.sdkPath);
//writer.println("sdk-location=" + Android.sdkPath); // r3 of the sdk
writer.println("sdk.dir=" + Android.sdkPath); // r4 of the sdk
writer.flush();
writer.close();
}
@@ -519,9 +525,7 @@ public class Build {
void writeLibs(File libsFolder) {
libsFolder.mkdirs();
//InputStream input = getClass().getResourceAsStream("processing-core.zip");
File file =
new File(Base.getSketchbookFolder(), Android.ANDROID_CORE_FILENAME);
InputStream input = PApplet.createInput(file);
InputStream input = PApplet.createInput(Android.getCoreZipFile());
PApplet.saveStream(new File(libsFolder, "processing-core.jar"), input);
}