[Esbox-commits] r1932 - in trunk: org.maemo.esbox.help/html/images/proj_wiz org.maemo.esbox.help/html/tasks org.maemo.esbox.tests/META-INF org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests org.maemo.esbox.tests/src/org/maemo/esbox/tests/python
fabricioepa at garage.maemo.org
fabricioepa at garage.maemo.org
Tue Aug 4 00:27:44 EEST 2009
Author: fabricioepa
Date: 2009-08-04 00:27:44 +0300 (Tue, 04 Aug 2009)
New Revision: 1932
Added:
trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png
Modified:
trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
trunk/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html
trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
trunk/org.maemo.esbox.tests/META-INF/MANIFEST.MF
trunk/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java
Log:
merging pydev branche
Added: trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png
===================================================================
(Binary files differ)
Property changes on: trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html 2009-08-03 20:56:28 UTC (rev 1931)
+++ trunk/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html 2009-08-03 21:27:44 UTC (rev 1932)
@@ -46,6 +46,12 @@
<p/>
<img src="../images/proj_wiz/wiz-python-project-variables.png" alt="variables">
</li>
+
+ <li>Click <strong>Next</strong> to set python interpreter and grammar configurations.
+ <p/>
+ <img src="../images/proj_wiz/wiz-python-project-interpreter-conf.png" alt="python interpreter conf">
+ </li>
+
<li> Click <strong>Finish</strong>.
You will be asked if you want to <a href="../tasks/ValidatingPackages.html">validate the build and runtime packages
for the project</a>.
Modified: trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html 2009-08-03 20:56:28 UTC (rev 1931)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html 2009-08-03 21:27:44 UTC (rev 1932)
@@ -38,10 +38,6 @@
easily repeatable UI.
</p>
<p>
- <b>NOTE:</b> The flasher requires special drivers and software to talk
- to the device and flash images to it. The wizard will automatically locate and install these for you.
- </p>
- <p>
All you need to do to prepare is to back up any personal settings and
files on your device which may be overwritten by the new image.
</p>
@@ -168,10 +164,7 @@
<li>
<p>
- Click <strong>Next</strong>. The wizard will now download the flasher binary (once)
- and also install any driver software required for communicating with
- the device in flashing mode. This may install additional software,
- such as the <a href="pc-connectivity.garage.maemo.org">Host PC Connectivity software</a>.
+ Click <strong>Next</strong>. The wizard will now download the flasher binary (once).
<p/>
<img src="../images/flash/dialog-flash-get-flasher.png" />
</li>
Modified: trunk/org.maemo.esbox.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.tests/META-INF/MANIFEST.MF 2009-08-03 20:56:28 UTC (rev 1931)
+++ trunk/org.maemo.esbox.tests/META-INF/MANIFEST.MF 2009-08-03 21:27:44 UTC (rev 1932)
@@ -30,8 +30,8 @@
org.eclipse.cdt.core;bundle-version="5.0.2",
org.maemo.mica.python.interpreter;bundle-version="2.0.0",
org.maemo.mica.python.project.core;bundle-version="2.0.0",
- org.python.pydev;bundle-version="1.4.4",
- org.python.pydev.core;bundle-version="1.4.4",
- org.maemo.esbox.scratchbox.tests;bundle-version="2.0.0"
+ org.maemo.esbox.scratchbox.tests;bundle-version="2.0.0",
+ org.python.pydev;bundle-version="1.4.7",
+ org.python.pydev.core;bundle-version="1.4.7"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: trunk/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
===================================================================
--- trunk/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java 2009-08-03 20:56:28 UTC (rev 1931)
+++ trunk/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java 2009-08-03 21:27:44 UTC (rev 1932)
@@ -51,10 +51,11 @@
suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectConverter.class));
suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectCreator.class));
suite.addTest(new JUnit4TestAdapter(TestDebianStructureGenerator4CppProject.class));
- suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));
+ suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));
+ suite.addTest(new JUnit4TestAdapter(TestPythonProjectProperties.class));
+
suite.addTest(new JUnit4TestAdapter(TestPythonProjectConverter.class));
suite.addTest(new JUnit4TestAdapter(TestPythonProjectCreator.class));
- suite.addTest(new JUnit4TestAdapter(TestPythonProjectProperties.class));
return suite;
}
Modified: trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java
===================================================================
--- trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java 2009-08-03 20:56:28 UTC (rev 1931)
+++ trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java 2009-08-03 21:27:44 UTC (rev 1932)
@@ -28,7 +28,6 @@
import org.maemo.mica.internal.api.python.interpreter.PyDevInterpreterConfigurator;
import org.maemo.mica.python.project.core.IMicaPythonProjectType;
import org.python.pydev.core.IInterpreterInfo;
-import org.python.pydev.core.Interpreter;
import org.python.pydev.plugin.nature.PythonNature;
/**
* @author Fabrício S Epaminondas (UFCG)
@@ -73,14 +72,14 @@
assertFalse(configurator.isInterpreterSubscribed(nature));
String pythonPath = "my/crazy/path";
- Interpreter defaultInterpreter = new Interpreter("Default Test Interpreter", "Default Test Interpreter", pythonPath);
+ String defaultInterpreter = "Default Test Interpreter";
assertNull(configurator.addInterpreterManager(nature, defaultInterpreter));
assertFalse(configurator.isInterpreterSubscribed(nature));
//TODO FIX: the test will fail if could not found the expected python location on local machine
assertFalse(configurator.isInterpreterSubscribed(nature));
- defaultInterpreter = configurator.getSDKTargetInterpreter(theSB1SDKTarget);
+ defaultInterpreter = configurator.getSDKTargetInterpreterName(theSB1SDKTarget);
IInterpreterInfo interpreterInfo = configurator.addInterpreterManager(nature, defaultInterpreter);
assertNotNull(interpreterInfo);
nature.getRelatedInterpreterManager().addInterpreterInfo(interpreterInfo);
More information about the Esbox-commits
mailing list