vmario/controlp5
0
0
Fork 0
mirror of https://github.com/sojamo/controlp5 synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip, minor changes to update build files to 2.2.7

Browse Source
This commit is contained in:
andreas schlegel 2018-09-22 11:47:14 +08:00
parent 075c8aef95
commit ef7c533212
6 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,5 +10,4 @@
.classpath .classpath
.project .project
.idea .idea
pom.xml
notes.md notes.md

8
resources/build.xml
View File

@ -11,15 +11,15 @@
<include name="core.jar"/> <include name="core.jar"/>
</fileset> </fileset>
</path> </path>
<property name="javaVersion" value="1.6"/> <property name="javaVersion" value="1.7"/>
<property name="author" value="Andreas Schlegel"/> <property name="author" value="Andreas Schlegel"/>
<property name="copyright" value="(c) 2006-2016"/> <property name="copyright" value="(c) 2006-2018"/>
<property name="libraryName" value="controlP5"/> <property name="libraryName" value="controlP5"/>
<property name="versionNumber" value="2.2.6"/> <property name="versionNumber" value="2.2.7"/>
<property name="yourLink" value="http://www.sojamo.de" /> <property name="yourLink" value="http://www.sojamo.de" />
<property name="keywords" value="gui, ui, controller, interface, user interface" /> <property name="keywords" value="gui, ui, controller, interface, user interface" />
<property name="tested:platform" value="osx, windows, linux" /> <property name="tested:platform" value="osx, windows, linux" />
<property name="tested:processingVersion" value="3.0.2" /> <property name="tested:processingVersion" value="3.3.6" />
<property name="tested:dependencies" value="none" /> <property name="tested:dependencies" value="none" />
<property name="source:host" value="github" /> <property name="source:host" value="github" />
<property name="source:url" value="https://github.com/sojamo/controlp5" /> <property name="source:url" value="https://github.com/sojamo/controlp5" />

13
resources/buildFast.xml
View File

@ -23,7 +23,7 @@
<!-- #### (4) set the java version that should be used to compile your library. #### --> <!-- #### (4) set the java version that should be used to compile your library. #### -->
<property name="javaVersion" value="1.5"/> <property name="javaVersion" value="1.7"/>
@ -35,13 +35,13 @@
<property name="author" value="Andreas Schlegel"/> <property name="author" value="Andreas Schlegel"/>
<!-- #### (6) which copyright? edit value. #### --> <!-- #### (6) which copyright? edit value. #### -->
<property name="copyright" value="(c) 2010"/> <property name="copyright" value="(c) 2018"/>
<!-- #### (7) give your library a name. edit value. #### --> <!-- #### (7) give your library a name. edit value. #### -->
<property name="libraryName" value="controlP5"/> <property name="libraryName" value="controlP5"/>
<!-- #### (8) give your library a name. edit value. #### --> <!-- #### (8) give your library a name. edit value. #### -->
<property name="versionNumber" value="2.1.5"/> <property name="versionNumber" value="2.2.7"/>
<!-- #### (9) your contact url. edit value. #### --> <!-- #### (9) your contact url. edit value. #### -->
<property name="yourLink" value="http://www.sojamo.de" /> <property name="yourLink" value="http://www.sojamo.de" />
@ -59,9 +59,9 @@
<property name="tested:dependencies" value="none" /> <property name="tested:dependencies" value="none" />
<!-- #### (14) where can the source code be found? edit value. #### --> <!-- #### (14) where can the source code be found? edit value. #### -->
<property name="source:host" value="google code" /> <property name="source:host" value="github" />
<property name="source:url" value="controlp5" /> <property name="source:url" value="controlp5" />
<property name="source:repository" value="http://code.google.com/p/controlp5/source/browse/" /> <property name="source:repository" value="https://github.com/sojamo/controlp5" />
@ -143,7 +143,10 @@
<fileset dir="src"/> <fileset dir="src"/>
</copy> </copy>
--> -->
<!--
<copy file="src-js/controlP5.js" tofile="${dist}/library/controlP5.js" overwrite="true" /> <copy file="src-js/controlP5.js" tofile="${dist}/library/controlP5.js" overwrite="true" />
-->
<!-- copy the jar file to processing's libraries --> <!-- copy the jar file to processing's libraries -->
<mkdir dir="${processing}/${libraryName}" /> <mkdir dir="${processing}/${libraryName}" />

4
resources/check-examples.sh
View File

@ -1,5 +1,5 @@
for d in $HOME/Documents/workspace/controlp5/examples/**/*/; do for d in $HOME/Documents/git/controlp5/examples/**/*/; do
# echo "$d" # echo "$d"
java -cp .:../distribution/tmp/controlP5/library/controlP5.jar:$HOME/Documents/workspace/libs/core.jar:./addons/AddMethodList AddMethodList $d java -cp .:../distribution/tmp/controlP5/library/controlP5.jar:$HOME/Documents/git/libs/core.jar:./addons/AddMethodList AddMethodList $d
processing-java --sketch="$d" --output=/tmp/processing-test --force --build processing-java --sketch="$d" --output=/tmp/processing-test --force --build
done done

4
resources/library.properties
View File

@ -38,7 +38,7 @@ paragraph = Includes interface elements such as slider, button, knob, toggle, te
# is used to compare different versions of the same library, and # is used to compare different versions of the same library, and
# check if an update is available. You should think of it as a # check if an update is available. You should think of it as a
# counter, counting the total number of releases you've had. # counter, counting the total number of releases you've had.
version = 85 # This must be parsable as an int version = 87 # This must be parsable as an int
# The version as the user will see it. If blank, the version attribute will be used here # The version as the user will see it. If blank, the version attribute will be used here
prettyVersion = 2.2.6 # This is treated as a String prettyVersion = 2.2.7 # This is treated as a String

2
src/controlP5/ControlP5.java
View File

@ -96,7 +96,7 @@ public class ControlP5 extends ControlP5Base {
/** /**
* @exclude * @exclude
*/ */
@ControlP5.Invisible public static final String VERSION = "2.2.6";// "##version##"; @ControlP5.Invisible public static final String VERSION = "2.2.7";// "##version##";
/** /**
* @exclude * @exclude