Merge branch 'master' of github.com:adarob/eXpress

adarob · Feb 10, 2014 · 7335213 · 7335213
2 parents 9c5a65d + 4544771
commit 7335213
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 25 deletions.
diff --git a/html/downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz b/html/downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz
diff --git a/html/downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz b/html/downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz
diff --git a/html/downloads/express-1.5.1/express-1.5.1-src.tgz b/html/downloads/express-1.5.1/express-1.5.1-src.tgz
diff --git a/html/downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip b/html/downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip
diff --git a/html/faq.html b/html/faq.html
@@ -124,10 +124,10 @@ <h2><i>Streaming</i> quantification for high-throughput sequencing</h2>
         <li><a href="#">Download<!--[if IE 7]><!--></a><!--<![endif]-->
           <!--[if lte IE 6]><table><tr><td><![endif]-->
             <ul>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'FAQ']);" target="_blank">Mac OS X (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'FAQ']);" target="_blank">Linux (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'FAQ']);" target="_blank">Windows (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'FAQ']);" target="_blank">Source Code</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'FAQ']);" target="_blank">Mac OS X (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'FAQ']);" target="_blank">Linux (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'FAQ']);" target="_blank">Windows (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'FAQ']);" target="_blank">Source Code</a></li>
               <li><a href="downloads" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','FAQ']);">Previous Versions</a></li>
            </ul>
           <!--[if lte IE 6]></td></tr></table></a><![endif]-->

diff --git a/html/index.html b/html/index.html
@@ -128,10 +128,10 @@ <h2><i>Streaming</i> quantification for high-throughput sequencing</h2>
         <li><a href="#">Download<!--[if IE 7]><!--></a><!--<![endif]-->
           <!--[if lte IE 6]><table><tr><td><![endif]-->
             <ul>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'home-menu']);" target="_blank">Mac OS X (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'home-menu']);" target="_blank">Linux (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'home-menu']);" target="_blank">Windows (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'home-menu']);" target="_blank">Source Code</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'home-menu']);" target="_blank">Mac OS X (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'home-menu']);" target="_blank">Linux (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'home-menu']);" target="_blank">Windows (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'home-menu']);" target="_blank">Source Code</a></li>
               <li><a href="downloads" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','home-menu']);">Previous Versions</a></li>
             </ul>
           <!--[if lte IE 6]></td></tr></table></a><![endif]-->
@@ -383,10 +383,10 @@ <h2>09.01.2011 &bull; eXpress 0.9.0 BETA released</h2>
           <h1>Download</h1>                    
           <h5>Current Release</h5>
           <p>eXpress 1.5.0
-          <br />&rarr; <a href="downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'home-side']);" target="_blank">Mac OS X (64-bit) Binary</a>
-          <br />&rarr; <a href="downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'home-side']);" target="_blank">Linux (64-bit) Binary</a>
-          <br />&rarr; <a href="downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'home-side']);" target="_blank">Windows (64-bit) Binary</a>
-          <br />&rarr; <a href="downloads/express-1.5.0/express-1.5.0-src.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'home-side']); " target="_blank">Source</a>
+          <br />&rarr; <a href="downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'home-side']);" target="_blank">Mac OS X (64-bit) Binary</a>
+          <br />&rarr; <a href="downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'home-side']);" target="_blank">Linux (64-bit) Binary</a>
+          <br />&rarr; <a href="downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'home-side']);" target="_blank">Windows (64-bit) Binary</a>
+          <br />&rarr; <a href="downloads/express-1.5.1/express-1.5.1-src.tgz" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'home-side']); " target="_blank">Source</a>
           <h5>Previous Versions</h5>
           <p>&rarr; <a href="downloads" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','home-side']);">View All</a>
 

diff --git a/html/manual.html b/html/manual.html
@@ -123,10 +123,10 @@ <h2><i>Streaming</i> quantification for high-throughput sequencing</h2>
         <li><a href="#">Download<!--[if IE 7]><!--></a><!--<![endif]-->
           <!--[if lte IE 6]><table><tr><td><![endif]-->
             <ul>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'Manual']);" target="_blank">Mac OS X (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'Manual']);" target="_blank">Linux (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'Manual']);" target="_blank">Windows (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'Manual']);" target="_blank">Source Code</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'Manual']);" target="_blank">Mac OS X (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'Manual']);" target="_blank">Linux (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'Manual']);" target="_blank">Windows (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'Manual']);" target="_blank">Source Code</a></li>
               <li><a href="downloads" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','Manual']);">Previous Versions</a></li>
             </ul>
           <!--[if lte IE 6]></td></tr></table></a><![endif]-->

diff --git a/html/overview.html b/html/overview.html
@@ -125,11 +125,11 @@ <h2><i>Streaming</i> quantification for high-throughput sequencing</h2>
         <li><a href="#">Download<!--[if IE 7]><!--></a><!--<![endif]-->
           <!--[if lte IE 6]><table><tr><td><![endif]-->
             <ul>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'About']);" target="_blank">Mac OS X (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'About']);" target="_blank">Linux (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'About']);" target="_blank">Windows (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'About']);" target="_blank">Mac OS X (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'About']);" target="_blank">Linux (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'About']);" target="_blank">Windows (64-bit)</a></li>
               <li><a href=downloads onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','About']);">Previous Versions</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'About']);" target="_blank">Source Code</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'About']);" target="_blank">Source Code</a></li>
             </ul>
           <!--[if lte IE 6]></td></tr></table></a><![endif]-->
         </li>

diff --git a/html/tutorial.html b/html/tutorial.html
@@ -123,10 +123,10 @@ <h2><i>Streaming</i> quantification for high-throughput sequencing</h2>
         <li><a href="#">Download<!--[if IE 7]><!--></a><!--<![endif]-->
           <!--[if lte IE 6]><table><tr><td><![endif]-->
             <ul>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'Tutorial']);" target="_blank">Mac OS X (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'Tutorial']);" target="_blank">Linux (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'Tutorial']);" target="_blank">Windows (64-bit)</a></li>
-              <li><a href=downloads/express-1.5.0/express-1.5.0-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'Tutorial']);" target="_blank">Source</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-macosx_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Mac', 'Tutorial']);" target="_blank">Mac OS X (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-linux_x86_64.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Linux', 'Tutorial']);" target="_blank">Linux (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-win32_x86_64.zip onClick="_gaq.push(['_trackEvent', 'Downloads', 'Windows', 'Tutorial']);" target="_blank">Windows (64-bit)</a></li>
+              <li><a href=downloads/express-1.5.1/express-1.5.1-src.tgz onClick="_gaq.push(['_trackEvent', 'Downloads', 'Source', 'Tutorial']);" target="_blank">Source</a></li>
               <li><a href="downloads" onClick="_gaq.push(['_trackEvent', 'Downloads', 'Previous','Tutorial']);">Previous Versions</a></li>
              </ul>
           <!--[if lte IE 6]></td></tr></table></a><![endif]-->

diff --git a/linux_build/src/express b/linux_build/src/express
diff --git a/package.sh b/package.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-VERSION=1.5.0
+VERSION=1.5.1
+OLD_VERSION=1.5.0
 MAC=express-$VERSION-macosx_x86_64
 LINUX=express-$VERSION-linux_x86_64
 WIN=express-$VERSION-win32_x86_64
@@ -21,6 +22,7 @@ rmdir html/doc/html
 mv html/doc/latex/refman.pdf html/doc/express-doc.pdf
 rm -r html/doc/latex
 
+sed -i '' "s/express-$OLD_VERSION/express-$VERSION/g" html/*.html
 
 #Create new download directories
 mkdir html/downloads/express-$VERSION

diff --git a/win_build/src/express.exe b/win_build/src/express.exe