Changes between Version 40 and Version 41 of xQTLAdministratorInstall

Timestamp:

2012-07-01T11:58:51+02:00 (12 years ago)

Author:

jvelde

Comment:

--

xQTLAdministratorInstall

@@ -33 +33 @@
 <font style="font-family: Courier">
 kill -9 &#96;lsof -i :9000 -t&#96;<br>
-cd ~/xqtl<br>
-svn update molgenis molgenis_apps<br>
-cd molgenis_apps<br>
+cd ~/xqtl/molgenis<br>
+git pull origin master<br>
+cd ~/xqtl/molgenis_apps<br>
+git pull origin master<br>
 ant -f xqtl_dev.xml clean_make<br>
 nohup ant -f xqtl_dev.xml runOn -Dport=9000 &<br>
@@ -56 +57 @@
 
 '''Update the application''':[[BR]]
-`svn update molgenis molgenis_apps`[[BR]]
+`git pull origin master`[[BR]]
 Followed by at least recompilation. This is the 'fast but may fail' option.[[BR]]
 `ant -f xqtl_dev.xml recompile`[[BR]]
@@ -74 +75 @@
 
 For '''further details''' you can consult the source of the various scripts:
-[http://www.molgenis.org/svn/molgenis_apps/trunk/xqtl_dev.xml development], [http://www.molgenis.org/svn/molgenis_apps/trunk/xqtl_selenium.xml webtesting], [http://www.molgenis.org/svn/molgenis_apps/trunk/xqtl_jar.xml jarbuilding].
+[https://github.com/joerivandervelde/molgenis_apps/blob/master/xqtl_dev.xml development], [https://github.com/joerivandervelde/molgenis_apps/blob/master/xqtl_selenium.xml webtesting], [https://github.com/joerivandervelde/molgenis_apps/blob/master/xqtl_jar.xml jarbuilding].
 
 === Download source into development IDE (OSX, UNIX, Windows): ===
@@ -90 +91 @@
 [[BR]]
 Older wiki @ http://www.molgenis.org/wiki/xQTLDemo
-[[BR]][[BR]]
-=== Complete Ubuntu installation and run (1 aug 2011) ===
-`sudo apt-get install subversion`[[BR]]
-`sudo apt-get install ant`[[BR]]
-`sudo apt-get install openjdk-6-jdk`[[BR]]
-`svn co http://www.molgenis.org/svn/molgenis/trunk/ molgenis`[[BR]]
-`svn co http://www.molgenis.org/svn/molgenis_apps/trunk/ molgenis_apps`[[BR]]
-`ant -f molgenis_apps/xqtl_dev.xml make_run`[[BR]]
-[[BR]]
-Note: If you didn't start the application as root (which you shouldn't), you may not have the rights to use the default storage path. In that case, set it to somewhere inside your home folder and proceed as usual. E.g. use `home/harry/xqtl/`
-[[BR]][[BR]]