Commit 60634817 authored by ylwu's avatar ylwu

Merge branch 'master' of github.com:ylwu/app-inventor-private into videocapture

parents 48af6a6a a1203f6b
......@@ -422,6 +422,9 @@ public class YABlockCompiler {
*/
public static String packageNameFromPath(String path) {
path = path.replaceFirst(".*?/?src/", "");
if (System.getProperty("os.name").startsWith("Windows")){
path = path.replace("/","\\").replaceFirst(".*?/?src/", "");
}
int extensionIndex = path.lastIndexOf(".");
if (extensionIndex != -1) {
return path.substring(0, extensionIndex).replaceAll("/", ".");
......
......@@ -72,6 +72,8 @@ public final class Compiler {
RUNTIME_FILES_DIR + "android.jar";
private static final String MAC_AAPT_TOOL =
"/tools/mac/aapt";
private static final String WINDOWS_AAPT_TOOL =
"/tools/windows/aapt";
private static final String LINUX_AAPT_TOOL =
"/tools/linux/aapt";
private static final String KAWA_RUNTIME =
......@@ -415,6 +417,10 @@ public final class Compiler {
String sourceFileRelativePath = sourceFileName.substring(srcIndex + 8);
String classFileName = (classesDir.getAbsolutePath() + "/" + sourceFileRelativePath)
.replace(YoungAndroidConstants.YAIL_EXTENSION, ".class");
if (System.getProperty("os.name").startsWith("Windows")){
classFileName = classesDir.getAbsolutePath()
.replace(YoungAndroidConstants.YAIL_EXTENSION, ".class");
}
// Check whether user code exists by seeing if a left parenthesis exists at the beginning of
// a line in the file
......@@ -516,6 +522,10 @@ public final class Compiler {
// This works when a JDK is installed with the JRE.
jarsignerFile = new File(javaHome + File.separator + ".." + File.separator + "bin" +
File.separator + "jarsigner");
if (System.getProperty("os.name").startsWith("Windows")){
jarsignerFile = new File(javaHome + File.separator + ".." + File.separator + "bin" +
File.separator + "jarsigner.exe");
}
if (!jarsignerFile.exists()) {
LOG.warning("YAIL compiler - could not find jarsigner.");
err.println("YAIL compiler - could not find jarsigner.");
......@@ -622,7 +632,9 @@ public final class Compiler {
aaptTool = MAC_AAPT_TOOL;
} else if (osName.equals("Linux")) {
aaptTool = LINUX_AAPT_TOOL;
} else {
} else if (osName.startsWith("Windows")) {
aaptTool = WINDOWS_AAPT_TOOL;
} else {
LOG.warning("YAIL compiler - cannot run AAPT on OS " + osName);
err.println("YAIL compiler - cannot run AAPT on OS " + osName);
userErrors.print(String.format(ERROR_IN_STAGE, "AAPT"));
......
......@@ -98,7 +98,11 @@ public final class Execution {
public static boolean execute(File workingDir, String[] command, PrintStream out,
PrintStream err) {
LOG.log(Level.INFO, "____Executing " + joiner.join(command));
if (System.getProperty("os.name").startsWith("Windows")){
for(int i =0; i < command.length; i++){
command[i] = command[i].replace("\"", "\\\"");
}
}
try {
Process process = Runtime.getRuntime().exec(command, null, workingDir);
new RedirectStreamHandler(new PrintWriter(out, true), process.getInputStream());
......
......@@ -36,24 +36,41 @@
<div class="content">
<div class="content-body">
<h2>Release Notes</h2>
<h2>Release Notes</h2>
<h3>Version 125, May 6, 2012</h3>
<ul>
<li> Added ability for apk's created with this version of AppInventor, to be uploaded to Google Play.
<li> Fixed Searching in documentation.
<li> launch_buildserver script now accepts command line arguments
<li> Fixed numerous issues in the documentation pages.
<li> App Inventor should now work better with IE9
<li> Fixed signout link
<li> Added a Shape property to the Button component
<li> Fixed orientation sensor documentation bug
<li> Made changes to make Button FontSize dynamic
<li> Updated notepad.jnlp to fix broken link.
<il> Made the "/learn", "/about", and "/forum" subtrees not require login.
<il> Added some minor logging improvements.
</ul>
</div>
<h3>Version 126, June 26, 2012</h3>
<ul>
<li> Upgrading the Player Component - Added a Completed event, an isPlaying method, a Looping and Volume property. Modified the Stop method to seek back to the beginning of the song.
<li> Updated Player Component Documentation.
<li> Added new flag to the launch-buildserer script allowing the ability to specify log file and output path.
<li> Added a link to the main panel for access to Release Notes.
<li> Updated text in Quizme tutorial.
<li> Added check for invalid file names.
<li> Modify LocationSensor component to include designer properties for time and distance notification intervals.
<li> Cleaned up misleading warning and error messages.
<li> Updated documentation on how to restart the app from the blocks editor.
<li> Added new property, MinimumInterval, to accelerometer, that keeps it from reporting Shaking events too often.
<li> Changed the error reporting so that red error messages in the Designer disappear when the user clicks the mouse anywhere on the screen.
<li> Updated documentation for color blocks to match the changes made in "make color" and "split color"
<li> Change version to come from Git rather than Mercurial.
</ul>
<p />
<h3>Version 125, May 6, 2012</h3>
<ul>
<li> Added ability for apk's created with this version of AppInventor, to be uploaded to Google Play.
<li> Fixed Searching in documentation.
<li> launch_buildserver script now accepts command line arguments
<li> Fixed numerous issues in the documentation pages.
<li> App Inventor should now work better with IE9
<li> Fixed signout link
<li> Added a Shape property to the Button component
<li> Fixed orientation sensor documentation bug
<li> Made changes to make Button FontSize dynamic
<li> Updated notepad.jnlp to fix broken link.
<il> Made the "/learn", "/about", and "/forum" subtrees not require login.
<il> Added some minor logging improvements.
</ul>
</div>
</div>
<div class="footer">
<script language = "JavaScript">createFooter();</script><br>
......
......@@ -139,6 +139,23 @@
</a>
.
</p>
<b>
The Blocks Editor won't open: The application starts
downloading and then nothing happens.
</b>
<p>
To diagnose this, first verify that your computer can run the
Java configuration tests and that you can load and run the
Notepad test. If not, you'll need to check your Java and Java
Web Start configurations. If Notepad runs, but the
Blocks Editor won't open, then this is most likely the
result of a firewall or other blocking software that is
preventing the blocks editor from communicating with
the browser, so check for firewalls and browser
security blocking extensions. There have also been
reports of cases where this behavior has been caused by
misconfigured virus protection programs.
</p>
<b>
I'm having various Java problems, and I'm running on Linux and OpenJDK.
</b>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment