add examples to the build, remove pdex platform chatter

This commit is contained in:
Ben Fry
2014-07-30 17:23:18 -04:00
parent e279fa2e47
commit e6bfc23741
3 changed files with 23 additions and 19 deletions
+15 -12
View File
@@ -31,6 +31,9 @@
</condition>
</fail>
<property name="examples.dir"
value="../../processing-docs/content/examples" />
<!-- Figure out the JRE download location for Linux and Windows. -->
<condition property="jre.file" value="jre-7u40-${platform}-i586.tgz">
<equals arg1="${sun.arch.data.model}" arg2="32" />
@@ -205,6 +208,10 @@
<input message="Enter version number:"
addproperty="version"
defaultvalue="${revision}" />
<available file="${examples.dir}" property="examples.exist" />
<fail unless="examples.exist" message="To do a distribution, the processing-docs repo must be checked out at the same level as the processing repo." />
<antcall target="${platform}-dist" />
</target>
@@ -229,6 +236,9 @@
<subant buildpath="../java/libraries/sound" target="clean"/>
<subant buildpath="shared/tools/MovieMaker" target="clean"/>
<subant buildpath="../pdex" target="clean"/>
<!-- make sure this isn't around from an old build 140730 -->
<delete dir="../java/examples" />
</target>
<target name="subprojects-build">
@@ -261,23 +271,16 @@
<fileset dir="../java">
<!-- don't include LWJGL, it's not operational -->
<exclude name="libraries/lwjgl/**" />
<!--
<exclude name="**/bin/*" />
<exclude name="**/src/*" />
<exclude name="examples" />
<exclude name="**/cmd/**" />
-->
<exclude name="reference.zip" />
<exclude name="**/._*" />
<!-- probably not necessary anymore -->
<exclude name="examples/**/applet/**" />
</fileset>
</copy>
<delete dir="${target.path}/modes/java/examples" failonerror="true">
<include name="**/applet/**" />
</delete>
<!-- get the examples folder -->
<copy todir="${target.path}/modes/java/examples">
<fileset dir="${examples.dir}" />
</copy>
<unzip dest="${target.path}/modes/java"
src="../java/reference.zip"
+1 -1
View File
@@ -37,7 +37,7 @@
<target name="clean" description="Clean the build directories">
<delete dir="bin" />
<delete file="mode/${lib.name}.jar" />
<echo message="Platform is ${platform}." />
<!--<echo message="Platform is ${platform}." />-->
</target>
+7 -6
View File
@@ -21,6 +21,12 @@ X was storing our fonts in both ./lib/fonts and jre/lib/fonts
X now gets the jre folder and loads from there
X make ant fail when trying to delete JRE files that don't exist
X some aren't being removed properly
X fix the build scripts to include the examples
X https://github.com/processing/processing/issues/2652
X all examples are out of "processing/java" and are now in "processing-docs/content/". The Book examples have been removed entirely from our repositories.
o "Platform is ${platform}" message during 'ant clean'
o on OS X, but not Windows (haven't checked Linux)
X this was in pdex/build.xml
gsoc
X clear status messages in the Contribution Manager
@@ -55,15 +61,10 @@ _ add a new pref for the 3.0 sketchbook location
_ make reference and examples build process part of dist
_ separate ant targets, but only require them for dist
_ as separate targets, folks can build explicitly if they'd like
_ remove reference.zip from main repo
_ fix the build scripts to include the examples
_ https://github.com/processing/processing/issues/2652
_ all examples are out of "processing/java" and are now in "processing-docs/content/". The Book examples have been removed entirely from our repositories.
_ reference wasn't included either
_ https://github.com/processing/processing/issues/2656
_ processing-web/java_generate/ReferenceGenerator
_ "Platform is ${platform}" message during 'ant clean'
_ on OS X, but not Windows (haven't checked Linux)
_ remove reference.zip from main repo
pending