Commit c45da73a authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

Get rid of ant-contrib to get this working in the unlimited compiler.

parent c3b43225
version-1=3
version-2=2
version-3=18
version-status=
controls-version-info=3.2.16
audio-version-info=3.2.11
flowplayer-js-version-info=3.2.13
manifest=manifest.xml
\ No newline at end of file
<project name="Custom ant tasks" default="package" basedir=".">
<property name="build.home" value="build/anttask"/>
<path id="compile.classpath">
<fileset dir="${build.home}"/>
<fileset dir="/Users/api/Applications/apache-ant-1.9.2/lib">
<include name="*.jar"/>
</fileset>
</path>
<!-- prepare -->
<target name="prepare">
<mkdir dir="${build.home}"/>
</target>
<!-- clean -->
<target name="clean">
<delete dir="${build.home}"/>
</target>
<!-- compile -->
<target name="compile" depends="prepare">
<javac
srcdir="src"
destdir="${build.home}"
deprecation="true"
debug="on"
includes="**/*.java">
<classpath refid="compile.classpath"/>
</javac>
</target>
<target name="package" depends="compile">
<jar jarfile="lib/ant-task.jar">
<fileset dir="${build.home}"/>
<manifest>
<attribute name="Main-Class" value="org.flowplayer.ant.Flatten"/>
<!--<attribute name="Class-Path" value="./lib/piimaa.jar ./lib/commons-codec-1.3.jar ./lib/commons-logging-1.1.1.jar ./lib/json-0.10.jar ./lib/typica.jar ./lib/jargs.jar ./lib/commons-httpclient-3.1.jar ./lib/commons-io-1.4.jar ./lib/jets3t-0.7.1.jar ./lib/commons-net-2.0.jar ./lib/commons-net-ftp-2.0.jar ./lib/jsch-0.1.42.jar"/>-->
</manifest>
</jar>
</target>
<!-- shortcuts -->
<target name="c" depends="clean"/>
<target name="co" depends="compile"/>
</project>
......@@ -18,11 +18,11 @@ js.deploy.dir=${site.dir}/deploy/js
deploy.dir=${site.dir}/content/swf
plugin.buildfiles=analytics/build.xml,audio/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml, \
captions/build.xml,content/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
f4m/build.xml,httpstreaming/build.xml,pseudostreaming/build.xml,rtmp/build.xml,securestreaming/build.xml, \
sharing/build.xml,slowmotion/build.xml,smil/build.xml,viralvideos/build.xml,securedrm/build.xml, \
bitrateselect/build.xml,menu/build.xml,cluster/build.xml
#plugin.buildfiles=analytics/build.xml,audio/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml, \
# captions/build.xml,content/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
# f4m/build.xml,httpstreaming/build.xml,pseudostreaming/build.xml,rtmp/build.xml,securestreaming/build.xml, \
# sharing/build.xml,slowmotion/build.xml,smil/build.xml,viralvideos/build.xml,securedrm/build.xml, \
# bitrateselect/build.xml,menu/build.xml,cluster/build.xml
jsplugins.buildfiles=controls/build.xml,embed/build.xml,ipad/build.xml,playlist/build.xml,bitrateselect/build.xml
......
<project name="Flowplayer" default="build">
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="./lib/ant-contrib.jar"/>
<pathelement location="./lib/ant-apache-regexp.jar"/>
</classpath>
</taskdef>
<taskdef name="flatten" classname="org.flowplayer.ant.Flatten" classpath="lib/ant-task.jar"/>
<property file="build.generated.properties"/>
<property file="${user.home}/core.properties" />
<property file="build.properties"/>
<property name="player-version" value="3.2.17" />
<property name="player-version" value="3.2.18" />
<property name="secondaries-file" value="../tld/secondary" />
<property file="${player-version}.properties" />
<loadfile srcfile="${secondaries-file}" property="secondaryTxt" />
<propertyregex property="secondary-domains" input="${secondaryTxt}" regexp="\n" replace=" " global="true" />
<flatten property="secondary-domains" value="${secondaryTxt}" />
<property name="secondary-domains-quoted" value="&quot;&#39;${secondary-domains}&#39;&quot;" />
<property name="source-dist-root-folder" value="flowplayer"/>
......
package org.flowplayer.ant;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
public class Flatten extends Task {
private String property;
private String value;
public void setProperty(String property) {
this.property = property;
}
public void setValue(String value) {
this.value = value;
}
public void execute() {
if (property == null) throw new BuildException("property not set");
if (value == null) throw new BuildException("value not set");
getProject().setNewProperty(property, value.replace("\n", " "));
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment