- Final candidate for v0.17

- Created an ant script which will build javadoc from main and integration - Updated gradle script for release and added a missing javadoc link
lessthanoptimal · Jun 19, 2014 · 27996c1 · 27996c1
1 parent 34a83ea
commit 27996c1
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 140 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ allprojects {
     apply plugin: 'eclipse'
 
     group = 'org.boofcv'
-    version = '0.17-SNAPSHOT'
+    version = '0.17'
 }
 
 subprojects {
@@ -55,8 +55,8 @@ subprojects {
 //        compile files("$libpath/lib/GeoRegression.jar")
 
         compile group: 'com.googlecode.efficient-java-matrix-library', name: 'ejml', version: '0.25'
-        compile group: 'org.ddogleg', name: 'ddogleg', version: '0.5-SNAPSHOT'
-        compile group: 'org.georegression', name: 'georegression', version: '0.6-SNAPSHOT'
+        compile group: 'org.ddogleg', name: 'ddogleg', version: '0.5'
+        compile group: 'org.georegression', name: 'georegression', version: '0.6'
 
         testCompile group: 'junit', name: 'junit', version: '4.+'
         testCompile files("$libpath/lib/testing/caliper.jar")
@@ -201,7 +201,7 @@ task createLibraryDirectory( dependsOn: javadocProjects.collect{ it+":jar"}+java
     }
 }
 
-task alljavadoc(type: Javadoc) << {
+task alljavadoc(type: Javadoc) {
     // only include source code in src directory to avoid including 3rd party code which some projects do as a hack
     source = javadocProjects.collect { project(it).fileTree('src').include('**/*.java') }
 //    source = javadocProjects.collect { project(it).sourceSets.main.allJava }
@@ -211,6 +211,7 @@ task alljavadoc(type: Javadoc) << {
     configure(options) {
         docTitle = "BoofCV JavaDoc ($project.version)"
         links = [ 'http://docs.oracle.com/javase/7/docs/api/',
+                  'http://ejml.org/javadoc/',
                   'http://georegression.org/javadoc/',
                   'http://ddogleg.org/javadoc/']
 //        header = file('misc/header.txt').text.replace("\n", "")

diff --git a/build.xml b/build.xml
@@ -0,0 +1,91 @@
+<project name="BoofCV_All" basedir="." default="javadocWeb">
+
+
+    <path id="source.classpath">
+        <pathelement path="main/calibration/src"/>
+        <pathelement path="main/feature/src"/>
+        <pathelement path="main/geo/src"/>
+        <pathelement path="main/io/src"/>
+        <pathelement path="main/ip/src"/>
+        <pathelement path="main/recognition/src"/>
+        <pathelement path="main/sfm/src"/>
+        <pathelement path="main/visualize/src"/>
+        <pathelement path="integration/android/src"/>
+        <pathelement path="integration/applet/src"/>
+        <pathelement path="integration/openkinect/src"/>
+        <pathelement path="integration/WebcamCapture/src"/>
+        <pathelement path="integration/xuggler/src"/>
+    </path>
+
+    <target name="javadocWeb">
+        <javadoc
+                destdir="docs/api"
+                author="true"
+                version="true"
+                use="true"
+                windowtitle="BoofCV"
+                sourcepathref="source.classpath">
+
+            <link offline="false" href="http://docs.oracle.com/javase/7/docs/api/" packagelistloc="package-list" />
+            <link offline="false" href="http://georegression.org/javadoc/" packagelistloc="package-list" />
+            <link offline="false" href="http://ddogleg.org/javadoc/" packagelistloc="package-list" />
+            <link offline="false" href="http://ejml.org/javadoc/" packagelistloc="package-list" />
+
+            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
+            <header><![CDATA[
+<script type="text/javascript"><!--
+google_ad_client = "ca-pub-0419821832107208";
+/* boofcv javadoc banner */
+google_ad_slot = "3257872658";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+]]>
+            </header>
+            <bottom><![CDATA[<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-10413214-5']);
+  _gaq.push(['_setDomainName', 'boofcv.org']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+<br>
+<b>Copyright &copy; 2011-2014 Peter Abeles</b>
+]]>
+            </bottom>
+
+        </javadoc>
+    </target>
+
+    <target name="javadoc">
+        <javadoc
+                destdir="docs/api"
+                author="true"
+                version="true"
+                use="true"
+                windowtitle="BoofCV"
+                sourcepathref="source.classpath" >
+
+            <link offline="false" href="http://docs.oracle.com/javase/7/docs/api/" packagelistloc="package-list" />
+            <link offline="false" href="http://georegression.org/javadoc/" packagelistloc="package-list" />
+            <link offline="false" href="http://ddogleg.org/javadoc/" packagelistloc="package-list" />
+            <link offline="false" href="http://ejml.org/javadoc/" packagelistloc="package-list" />
+
+            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
+            <bottom><![CDATA[<b>Copyright &copy; 2011-2014 Peter Abeles</b>]]></bottom>
+
+        </javadoc>
+        <jar compress="true" destfile="docs/javadoc.jar" basedir="docs/api" />
+    </target>
+</project>
diff --git a/change.txt b/change.txt
@@ -3,7 +3,7 @@ Change Log
 Date Format: year/month/day
 
 ---------------------------------------------
-Date    : 2014
+Date    : 2014/6/19
 Version : Alpha 0.17
 
 - Improved/Fixed serialization
@@ -65,6 +65,7 @@ Version : Alpha 0.17
   * Lots of examples
   * Simplified interface for working with BoofCV
 - XStream now works without that ugly hack
+  * Thanks to Jörg Schaible of XStream for fixing the issue and all the help
 - Webcam Capture Support
   * Easy to use library for streaming webcams
   * Wrote several example showing how Webcam Capture can be used with BoofCV

diff --git a/integration/build.xml b/integration/build.xml
@@ -19,69 +19,6 @@
       <pathelement path="openkinect/src"/>
     </path>
 
-
-    <target name="javadocWeb">
-        <javadoc
-                destdir="docs/api"
-                author="true"
-                version="true"
-                use="true"
-                windowtitle="BoofCV"
-	        sourcepathref="source.classpath">
-
-            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
-	    <header><![CDATA[
-<script type="text/javascript"><!--
-google_ad_client = "ca-pub-0419821832107208";
-/* boofcv javadoc banner */
-google_ad_slot = "3257872658";
-google_ad_width = 468;
-google_ad_height = 60;
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-]]>
-</header>
-            <bottom><![CDATA[<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-10413214-5']);
-  _gaq.push(['_setDomainName', 'boofcv.org']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-<br>
-<b>Copyright &copy; 2011-2012 Peter Abeles</b>
-]]>
-</bottom>
-
-        </javadoc>
-    </target>
-
-    <target name="javadoc">
-        <javadoc
-                destdir="docs/api"
-                author="true"
-                version="true"
-                use="true"
-                windowtitle="BoofCV"
-	        sourcepathref="source.classpath">
-
-
-            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
-            <bottom><![CDATA[<b>Copyright &copy; 2011-2012 Peter Abeles</b>]]></bottom>
-
-        </javadoc>
-    </target>
-
     <target name="test">
 	<!--ant dir="android/" target="test"/-->
 	<ant dir="xuggler/" target="test"/>

diff --git a/main/build.xml b/main/build.xml
@@ -16,78 +16,6 @@
       <pathelement path="recognition/src"/>
       <pathelement path="visualize/src"/>
     </path>
-
-
-    <target name="javadocWeb">
-        <javadoc
-                destdir="docs/api"
-                author="true"
-                version="true"
-                use="true"
-                windowtitle="BoofCV"
-	        sourcepathref="source.classpath">
-
-            <link offline="false" href="http://docs.oracle.com/javase/7/docs/api/" packagelistloc="package-list" />
-            <link offline="false" href="http://georegression.org/javadoc/" packagelistloc="package-list" />
-            <link offline="false" href="http://ddogleg.org/javadoc/" packagelistloc="package-list" />
-            <link offline="false" href="http://ejml.org/javadoc/" packagelistloc="package-list" />
-
-            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
-	    <header><![CDATA[
-<script type="text/javascript"><!--
-google_ad_client = "ca-pub-0419821832107208";
-/* boofcv javadoc banner */
-google_ad_slot = "3257872658";
-google_ad_width = 468;
-google_ad_height = 60;
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-]]>
-</header>
-            <bottom><![CDATA[<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-10413214-5']);
-  _gaq.push(['_setDomainName', 'boofcv.org']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-<br>
-<b>Copyright &copy; 2011-2013 Peter Abeles</b>
-]]>
-</bottom>
-
-        </javadoc>
-    </target>
-
-    <target name="javadoc">
-        <javadoc
-                destdir="docs/api"
-                author="true"
-                version="true"
-                use="true"
-                windowtitle="BoofCV"
-	        sourcepathref="source.classpath" >
-
-            <link offline="false" href="http://docs.oracle.com/javase/7/docs/api/" packagelistloc="package-list" />
-            <link offline="false" href="http://georegression.org/javadoc/" packagelistloc="package-list" />
-            <link offline="false" href="http://ddogleg.org/javadoc/" packagelistloc="package-list" />
-
-            <doctitle><![CDATA[<h1>BoofCV API Specification</h1>]]></doctitle>
-            <bottom><![CDATA[<b>Copyright &copy; 2011-2013 Peter Abeles</b>]]></bottom>
-
-        </javadoc>
-	<jar compress="true" destfile="docs/javadoc.jar" basedir="docs/api" />
-    </target>
 
     <target name="test">
 	<ant dir="ip/" target="test"/>