Permalink
Browse files

Updated license, INSTALL, and README.

MIT license was overwritten by a bogus version. Fixed. INSTALL
and README have been updated. Ignore settings added to mask
binary distribution directories. Build directory has been changed.
  • Loading branch information...
1 parent 8a88538 commit f40fc3afa64bafd2d6776539bdbc297a8da6a54e M Butcher committed Jul 4, 2009
Showing with 35 additions and 15 deletions.
  1. +1 −0 .gitignore
  2. +15 −12 COPYING-MIT.txt
  3. +16 −0 INSTALL
  4. +1 −1 README
  5. +2 −2 build.xml
View
@@ -4,6 +4,7 @@ bin/*.tgz
bin/*.zip
*.tmproj
releases
+dist
test/coverage
test/reports
test/db
View
@@ -2,17 +2,20 @@ QueryPath: Find your way
Matt Butcher <mbutcher@aleph-null.tv>
Copyright (C) 2009 Matt Butcher
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
View
@@ -21,6 +21,9 @@ To install QueryPath-minimal:
mv QueryPath-2.0-minimal myproject/QueryPath
+ (Alternately, you may wish to install QueryPath in a location available on
+ you PHP library path for use in all applications on your system.)
+
- Include QueryPath in your scripts:
require 'QueryPath/QueryPath.php';
@@ -43,5 +46,18 @@ To install QueryPath:
- Include QueryPath/QueryPath.php in your PHP scripts
require 'QueryPath/QueryPath.php';
+
+The structure of the full version:
+
+/ -- Base information about the library
+ src/ -- The source (PHP) code. Include the contents of this directory in your
+ applications.
+ test/ -- Unit tests for QueryPath. You can run these with PHPUnit.
+ examples/ -- Examples scripts written with QueryPath.
+ docs/ -- Full API documentation in HTML format. You can regenerate this from
+ the source using PHPDocumentor.
+ tutorials/ -- DocBook additions to the QueryPath PHPDocumentor data. An HTML
+ version of this is included in the docs/ directory. The files here are
+ probably only useful when re-generating the API documentation.
For more information, visit http://querypath.org.
View
@@ -3,7 +3,7 @@ Author: Matt Butcher
Website: http://querypath.org
API Docs: http://api.querypath.org
-This package is licensed under the GNU LGPL or, at your choice, an MIT-style
+This package is licensed under the GNU LGPL 2.1 or, at your choice, an MIT-style
license. The licenses should have been distributed with this library.
LGPL:
View
@@ -11,7 +11,7 @@ Phing is a build tool. Learn more about it at http://phing.info.
Copyright (c) 2009, Matt Butcher, some rights reserved.
License:
-This file is released under the GNU LGPL 2.1 or, at your preference,
+QueryPath is released under the GNU LGPL 2.1 or, at your preference,
an MIT license. See COPYING-LGPL.txt and COPYING-MIT.txt for details.
-->
@@ -20,7 +20,7 @@ an MIT license. See COPYING-LGPL.txt and COPYING-MIT.txt for details.
<property name="testdir" value="./test"/>
<property name="builddir" value="./bin/build"/>
<property name="docsdir" value="./docs"/>
- <property name="packagedir" value="./releases"/>
+ <property name="packagedir" value="./dist"/>

0 comments on commit f40fc3a

Please sign in to comment.