cleaning up build behavior and readme

.gitignore

@@ -1,8 +1,11 @@
-# Mac fun
 .DS_Store
+*~
+
+local.properties
+/BezierSQLib
 
 # ant-javac build directory
-bin/
+/bin/
 
 # hide some results
 documentation/*

build.xml

@@ -8,11 +8,17 @@
 
 	<!-- == Change these two for building == -->
 
-	<!-- Change to point to Processings library folder (core.jar, etc) -->
-	<property name="libraryClasspath"  
-			  location="/Applications/Processing.app/Contents/Resources/Java/"/>
-	<property name="processing.classes" 
-			  location="/Users/fjenett/Repos/processing/build/macosx/work/Processing.app/Contents/Resources/Java/" />
+	<property file="local.properties" />
+
+    <condition property="props.present">
+    	<available file="local.properties" />
+  	</condition>
+
+    <fail unless="processing.dir" message="To make the build work, create a file named local.properties, with the following:
+${line.separator}processing.dir=/path/to/processing-git
+${line.separator}with the path to where you have the code for Processing checked out. ${line.separator}(This script will look for the 'core' directory inside that folder.)
+${line.separator}libraries.dir=/path/to/sketchbook/libraries
+${line.separator}with the full path to the 'libraries' folder inside your sketchbook." />
 
 	<!-- Change to point to your user libraries folder inside your sketchbook -->
 	<property name="processing" location="/Users/fjenett/Documents/Processing/libraries"/>
@@ -22,10 +28,10 @@
 	<property name="author" 		value="Florian Jenett"/>
 	<property name="copyright" 		value="(c) 2005 - 2012"/>
 	<property name="libraryName"  	value="BezierSQLib"/>
-	<property name="versionNumber"  value="0.2.1"/>
+	<property name="versionNumber"  value="0.3.1"/>
 	<property name="yourLink"  		value="http://bezier.de/" />
 	<property name="keywords" 		value="MySQL, SQLite, PostgreSQL, SQL, database"/>
-	<property name="javaVersion" 	value="1.5"/>
+	<property name="javaVersion" 	value="1.8"/>
 
 	<buildnumber file="resources/build.number" />
 
@@ -38,7 +44,7 @@
 	</path>
 
 	<path id="library-classpath">
-		<fileset dir="${processing.classes}" >
+		<fileset dir="${processing.dir}" >
 			<include name="core/library/core.jar"/>
 		</fileset>
 		<path refid="library-classes-add" />
@@ -60,8 +66,8 @@
 Properties initialized.
 src path		${src}
 bin path 		${bin}
-Processing classes	${processing.classes}
-processing Libraries	${processing}
+Processing dir	${processing.dir}
+processing Libraries	${libraries.dir}
 java version		${javaVersion}
 	</echo>
 
@@ -185,9 +191,9 @@ java version		${javaVersion}
 	 + + + + + + + + + + + + + + + + + + + + + + + -->
 	<target name="install" depends="package">
 
-		<mkdir dir="${processing}/${libraryName}" />
+		<mkdir dir="${libraries.dir}/${libraryName}" />
 
-		<copy todir="${processing}/${libraryName}">
+		<copy todir="${libraries.dir}/${libraryName}">
 			<fileset dir="${dist}"/>
 		</copy>
 

readme.md

@@ -1,17 +1,14 @@
---------------------------------------------------------------------------------
+Florian Jenett's library that wraps around JDBC drivers to let you access MySQL, SQLite and PostgreSQL databases. [Link to original project](https://github.com/fjenett/sql-library-processing)
 
-SQLibrary, a Processing library that wraps around JDBC drivers to let
-you access MySQL, SQLite and PostgreSQL databases
-    
---------------------------------------------------------------------------------
+## Latest Release
 
 ~~Latest release (same that is in Processing's library manager):
 https://raw.github.com/fjenett/sql-library-processing/latest/release/BezierSQLib.zip~~
 
-Modified slightly for Processing 3. Install manually by unzipping this folder into your libraries folder:
+This fork has been modified slightly for Processing 3. It's now available in the Contribution Manager in the PDE, or you can install manually by unzipping this folder into your libraries folder:
 https://github.com/benfry/sql-library-processing/raw/master/release/BezierSQLib.zip
 
---------------------------------------------------------------------------------
+## Features
 
 It's not an ORM (and will not become one) but it has some handy features
 since v0.2.0 that makes it easier to load and save objects to a database.
@@ -23,10 +20,9 @@ since v0.2.0 that makes it easier to load and save objects to a database.
 See:
 https://raw.github.com/fjenett/sql-library-processing/master/src/de/bezier/data/sql/SQL.java
 
---------------------------------------------------------------------------------
+## Database Drivers
 
-Parts of this library are available under their own licenses. These are
-redistributed as downloaded from the original sources:
+Parts of this library are available under their own licenses. These are redistributed as downloaded from the original sources:
 
 MySQL Connector/J (JDBC driver)
 mysql-connector-java-3.1.8-bin.jar
@@ -44,9 +40,3 @@ SQLite JDBC driver
 sqlite-jdbc-3.7.2.jar
 http://code.google.com/p/sqlite-jdbc/
 Apache License 2.0, http://www.apache.org/licenses/LICENSE-2.0
-    
---------------------------------------------------------------------------------
-
-https://github.com/fjenett/sql-library-processing
-
---------------------------------------------------------------------------------

resources/library.properties

@@ -1,7 +1,7 @@
 name = @@LIBRARY_NAME@@
 authorList = [Florian Jenett](http://www.bezier.de/)
 url = https://github.com/fjenett/sql-library-processing
-category = DATA
+category = Data
 sentence = A library to facilitate communication with SQL-based databases
 paragraph =  SQLibrary is an interface to MySQL, SQLite and PostgreSQL databases
 version = @@VERSION@@