Merge from 3.0 branch till 1166.

3 files changed, 11 insertions, 7 deletions

diff --git a/buildscripts/classtree/build.php b/buildscripts/classtree/build.php
index ffb4eef3..bc95d1c8 100644
--- a/buildscripts/classtree/build.php
+++ b/buildscripts/classtree/build.php
@@ -13,7 +13,7 @@ $exclusions=array(
 	);

 $a=new ClassTreeBuilder($rootPath,$exclusions);

 $a->buildTree();

-$a->saveToFile('classtree.data');

+$a->saveToFile('classes.data');

 

 class ClassTreeBuilder

 {

@@ -174,6 +174,10 @@ class ClassTreeBuilder
 		closedir($folder);

 		return $files;

 	}

+

+	public function saveAsTagLib($fileName)

+	{

+	}

 }

 

 ?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/build.php b/buildscripts/texbuilder/build.php
index cbea9859..c0577c8f 100644
--- a/buildscripts/texbuilder/build.php
+++ b/buildscripts/texbuilder/build.php
@@ -5,7 +5,7 @@
 $pdflatexExec = "C:/Wei/miktex/texmf/MiKTeX/bin/pdflatex.exe";

 $pdfTex = "$pdflatexExec -interaction=nonstopmode -max-print-line=120 %s";

 

-$mainTexFile = dirname(__FILE__).'/prado3_quick_start.tex';

+$mainTexFile = dirname(__FILE__).'/quickstart.tex';

 

 //page root location

 $base = realpath(dirname(__FILE__).'/../../demos/quickstart/protected/pages/');

@@ -244,14 +244,14 @@ foreach($pages as $chapter => $sections)
 		echo "    Adding $section\n";

 		$page = $base.'/'.$section;

 		$current_path = $page;

-		

+

 		//add id to <h1>, <h2>, <3>

 		$tmp_content = set_header_id(file_get_contents($page),$j++);

 		file_put_contents($page, $tmp_content);

-		

+

 		$content .= get_section_label($section);

 		$file_content = file_get_contents($page);

-		$tex = 

+		$tex =

 		$content .= parse_html($page,$file_content);

 	}

 

@@ -265,7 +265,7 @@ foreach($pages as $chapter => $sections)
 

 if($argc <= 1 && $count > 1)

 {

-	echo "** Use pdflatex to compile prado3_quick_start.tex to obtain PDF version of quickstart tutorial. **\n";

+	echo "** Use pdflatex to compile quickstart.tex to obtain PDF version of quickstart tutorial. **\n";

 	exit;

 }

 if($argv[1] == 'pdf')

@@ -277,7 +277,7 @@ if($argv[1] == 'pdf')
 		system($command);

 		system($command); //run it twice

 

-		echo "\n\n** PDF file prado3_quick_start.pdf created **\n\n";

+		echo "\n\n** PDF file quickstart.pdf created **\n\n";

 

 	}

 	else

diff --git a/buildscripts/texbuilder/prado3_quick_start.tex b/buildscripts/texbuilder/quickstart.tex
index ee3010fe..ee3010fe 100644
--- a/buildscripts/texbuilder/prado3_quick_start.tex
+++ b/buildscripts/texbuilder/quickstart.tex