cleaning up build behavior and readme

Esse commit está contido em:
Ben Fry
2019-02-09 09:54:51 -05:00
commit fcf2df6abf
4 arquivos alterados com 75 adições e 76 exclusões
+5 -2
Ver Arquivo
@@ -1,8 +1,11 @@
# Mac fun
.DS_Store
*~
local.properties
/BezierSQLib
# ant-javac build directory
bin/
/bin/
# hide some results
documentation/*
+63 -57
Ver Arquivo
@@ -1,34 +1,40 @@
<project name="BezierSQLib" default="install" basedir="./">
<description>
BezierSQLib (formerly SQLibrary) build file, based on Processing libraries build file.
</description>
<target name="settings">
<!-- == 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"/>
<property name="processing" location="/Users/fjenett/Documents/Processing/libraries"/>
<!-- No changes or adjustments required below -->
<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" />
<path id="library-classes-add">
<fileset dir="lib">
<include name="mysql-connector-java-3.1.14-bin.jar"/> <!-- MySQL -->
@@ -38,50 +44,50 @@
</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" />
</path>
<property name="jarFile" value="${libraryName}.jar"/>
<property name="src" location="src"/>
<property name="bin" location="bin"/>
<property name="javadoc" location="documentation"/>
<property name="dist" value="${libraryName}"/>
<property name="build" location="build"/>
<property name="web" location="../sql-website" />
<property name="web" location="../sql-website" />
</target>
<target name="init" depends="settings">
<echo>
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>
<buildnumber file="lib/build.number"/>
<tstamp>
<format property="date" pattern="MM/dd/yyyy" offset="0" unit="hour"/>
</tstamp>
<echo>Start to build the library ... this is vers. ${versionNumber}, build #${build.number} on ${date}</echo>
<!-- add ant-contrib package, needed for <foreach> -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="lib/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>
<mkdir dir="${dist}"/>
</target>
<!-- + + + + + + + + + + + + + + + + + + + + + + +
COMPILE, BUILD
+ + + + + + + + + + + + + + + + + + + + + + + -->
@@ -103,11 +109,11 @@ java version ${javaVersion}
<mkdir dir="${javadoc}" />
<javadoc bottom="Processing library ${libraryName} (formerly SQLibrary) by ${author}. ${copyright}"
destdir="${javadoc}"
verbose="false"
stylesheetfile="resources/stylesheet.css"
doctitle="Javadocs: ${libraryName}"
public="true" version="false"
destdir="${javadoc}"
verbose="false"
stylesheetfile="resources/stylesheet.css"
doctitle="Javadocs: ${libraryName}"
public="true" version="false"
windowtitle="Javadocs: ${libraryName} (formerly SQLibrary)">
<fileset dir="${src}" defaultexcludes="yes">
<include name="**/*"/>
@@ -144,7 +150,7 @@ java version ${javaVersion}
<copy todir="${dist}/library">
<path refid="library-classes-add" />
</copy>
<copy todir="${dist}/documentation">
<fileset dir="${javadoc}" />
</copy>
@@ -176,7 +182,7 @@ java version ${javaVersion}
<fileset file="${dist}/library.properties" />
</copy>
</target>
@@ -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>
@@ -203,61 +209,61 @@ java version ${javaVersion}
<move todir="${web}/documentation">
<fileset dir="${dist}/documentation" />
</move>
<move todir="${web}/examples">
<fileset dir="${dist}/examples" />
</move>
<copy todir="${web}">
<fileset dir="resources/web" />
</copy>
<!--
format the index.html file.
regular expressions are used to parse the web index.html file.
key words starting and ending with ## are replaced by values
format the index.html file.
regular expressions are used to parse the web index.html file.
key words starting and ending with ## are replaced by values
defined earlier in the beginning of this build file.
-->
<replaceregexp file="${web}/index.html"
match="##yourLibrary##"
replace="${libraryName}"
flags="g" />
<replaceregexp file="${web}/index.html"
match="##author##"
replace="${author}"
flags="g" />
<replaceregexp file="${web}/index.html"
match="##versionNumber##"
replace="${versionNumber}"
flags="g" />
<replaceregexp file="${web}/index.html"
match="##yourLink##"
replace="${yourLink}"
flags="g" />
<replaceregexp file="${web}/index.html"
match="##date##"
replace="${date}"
flags="g" />
<replaceregexp file="${web}/index.html"
match="##keywords##"
replace="${keywords}"
flags="g" />
<antcall target="processExamples" />
<mkdir dir="${web}/download" />
<copy file="releases/${libraryName}-${versionNumber}.zip" todir="${web}/download" />
</target>
<!-- + + + + + + + + + + + + + + + + + + + + + + +
CLEAN
@@ -267,9 +273,9 @@ java version ${javaVersion}
<delete dir="${javadoc}" />
<delete dir="${build}" />
<delete dir="${web}" />
</target>
</target>
<!-- + + + + + + + + + + + + + + + + + + + + + + +
EXAMPLES, all
+ + + + + + + + + + + + + + + + + + + + + + + -->
@@ -289,17 +295,17 @@ java version ${javaVersion}
replace=""
flags="g" />
</target>
<!-- + + + + + + + + + + + + + + + + + + + + + + +
EXAMPLES, one
+ + + + + + + + + + + + + + + + + + + + + + + -->
<target name="addExamples" depends="settings">
<property name="exampleZipped" value="${exampleDir}.zip"/>
<zip destfile="${web}/examples/${exampleZipped}"
basedir="${web}/examples/${exampleDir}/"
excludes="**/_DS.Store" />
<replaceregexp file="${web}/index.html"
match="(##examples##)"
replace="&lt;li&gt;&lt;a href=&quot;examples/${exampleZipped}&quot;&gt;${exampleDir}&lt;/a&gt;&lt;/li&gt; \1"
+6 -16
Ver Arquivo
@@ -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
--------------------------------------------------------------------------------
+1 -1
Ver Arquivo
@@ -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@@