X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=README;h=19b0c2d17084f40d5d7ac91b2f84e42c402518b6;hb=b7e521af667bdc18f9071075d1face56367eab69;hp=76814d124c8ec5f44ef56921dcfc3e630519cb73;hpb=0f56a75191c95a02b5f5ee90d9a6a57f72b0433b;p=jalview.git

diff --git a/README b/README
index 76814d1..19b0c2d 100755
--- a/README
+++ b/README
@@ -1,20 +1,46 @@
 Jalview Readme
-For Jims Branch!
 --------------
 
 
 The source is available as a tar file and comes complete with the GNU General Public License. 
 
-To build the application you will need a J2SDK 1.5+. 
+To build the application you will need a J2SDK 1.7+. 
 
 An Ant build file (build.xml) is provided, you will need to install Apache Ant first. 
 Run ant to view usage which will display a list of useful build targets.
 
+Jalview is primarily developed with eclipse, and a .project file is provided to simplify importing the source into your own eclipse workspace. A NetBeans nbbuild.xml file is also provided for developing Jalview with NetBeans - but this is not officially supported.
+
 You may also be able to use Borland JBuilder to build Jalview. A JBuilder project file 
 (JalviewX.jpx, JalviewApplet.jpx) for both application and applet is provided, 
 but the library dependencies are almost certainly out of date. See the build.xml 
 for current dependencies.
 
+##
+
+Jalview-JS
+
+To enable transpilation of Jalview's code:
+
+1. Locate the 'dropins' directory in your eclipse installation and copy swingjs/net.sf.j2s.core.jar to it.
+  - typically it is at the top of the Eclipse installation, or on OSX under Eclipse.app/Contents/Eclipse
+  
+2. Restart Eclipse
+
+3. If all is well you should see the 'Java2Script' builder is listed as the primary builder for the Jalview project.
+  if not, this is because your properties file needs to have the standard java builder replaced with the following:
+  <name>net.sf.j2s.core.java2scriptbuilder</name>
+
+- otherwise Javascript files will now be generated in the site/swingjs/j2s directory whenever a build occurs
+
+4. Execute the 'unzip-to-site' task (if it isn't automatically run) to update the site directory with the latest versions of SwingJS, varna-js, JSmol and other dependencies required by Jalview.
+
+
+  
+
+
+##
+
 For more help, read the file doc/building.html
 
 
@@ -24,7 +50,10 @@ To run application:
 
 java -Djava.ext.dirs=JALVIEW_HOME/lib -cp JALVIEW_HOME/jalview.jar jalview.bin.Jalview
 
-Replace JALVIEW_HOME with the full path to Jalview Installation Directory.
+Replace JALVIEW_HOME with the full path to Jalview Installation Directory. If building from source:
+
+java -Djava.ext.dirs=JALVIEW_BUILD/dist -cp JALVIEW_BUILD/dist/jalview.jar jalview.bin.Jalview
+
 
 ##################