From 9cc6b7fffd31f4b9ee9aceef9224c84dcf28aeb8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 4 Jul 2006 23:25:41 +0000
Subject: Merge from 3.0 branch till 1239.

---
 buildscripts/phing/bin/phing.php       | 4 ++++
 buildscripts/texbuilder/quickstart.tex | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'buildscripts')

diff --git a/buildscripts/phing/bin/phing.php b/buildscripts/phing/bin/phing.php
index 880adf41..7d0a774a 100644
--- a/buildscripts/phing/bin/phing.php
+++ b/buildscripts/phing/bin/phing.php
@@ -13,6 +13,7 @@
 ini_set('track_errors', 1);
 
 /* set classpath */
+/*
 if (getenv('PHP_CLASSPATH')) {
 //    define('PHP_CLASSPATH',  getenv('PHP_CLASSPATH') . PATH_SEPARATOR . get_include_path());
     define('PHP_CLASSPATH',  realpath(dirname(__FILE__).'/../classes') . PATH_SEPARATOR . get_include_path());
@@ -20,6 +21,9 @@ if (getenv('PHP_CLASSPATH')) {
 } else {
     define('PHP_CLASSPATH',  get_include_path());
 }
+*/
+define('PHP_CLASSPATH',  realpath(dirname(__FILE__).'/../classes') . PATH_SEPARATOR . get_include_path());
+ini_set('include_path', PHP_CLASSPATH);
 
 require_once 'phing/Phing.php';
 
diff --git a/buildscripts/texbuilder/quickstart.tex b/buildscripts/texbuilder/quickstart.tex
index 35ba86a5..a0553658 100644
--- a/buildscripts/texbuilder/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart.tex
@@ -42,7 +42,7 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.0.2 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.0.3 Quickstart Tutorial
     \thanks{Copyright 2005-2006. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
@@ -68,7 +68,7 @@ Prado quick start doc
 \chapter*{License}
 \addcontentsline{toc}{chapter}{License}
 PRADO is free software released under the terms of the following BSD license.\\
-Copyright 2004-2006, PradoSoft (http://www.pradosoft.com)\\
+Copyright 2004-2006, The PRADO Group (http://www.pradosoft.com)\\
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,7 @@ this list of conditions and the following disclaimer.
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-\item Neither the name of the developer nor the names of its contributors may
+\item Neither the name of the PRADO Group nor the names of its contributors may
 be used to endorse or promote products derived from this software without
 specific prior written permission.
 \end{enumerate}
-- 
cgit v1.2.3