Commit 9b835060 authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

Merge pull request #9 from flowplayer/dev

3.2.17
parents df9240ba 40b97c67
version-1=3
version-2=2
version-3=17
version-status=dev
controls-version-info=3.2.15-dev
audio-version-info=3.2.11-dev
flowplayer-js-version-info=3.2.13-dev
manifest=manifest.xml
\ No newline at end of file
version-1=3
version-2=2
version-3=17
version-status=dev
version-status=
controls-version-info=3.2.15
audio-version-info=3.2.10
flowplayer-js-version-info=3.2.12
audio-version-info=3.2.11
flowplayer-js-version-info=3.2.13
manifest=manifest.xml
\ No newline at end of file
......@@ -17,17 +17,12 @@ site.dir=/Users/api/github/site
js.deploy.dir=${site.dir}/deploy/js
deploy.dir=${site.dir}/content/swf
# 3.2.17: controls (3.2.16), rtmp (3.2.13), bwcheck (3.2.13), f4m (3.2.10), cluster (3.2.10), pseudostreaming (3.2.13),
# httpstreaming (3.2.11), menu (3.2.13)
urlbase=http://flash.cdn.dev94.flowplayer.us.s3.amazonaws.com/
#urlbase=http://releases.flowplayer.org/
plugin.buildfiles=controls/build.xml,securestreaming/build.xml
#plugin.buildfiles=controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml,\
# rtmp/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml,f4m/build.xml,cluster/build.xml,pseudostreaming/build.xml, \
# httpstreaming/build.xml,menu/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
......
......@@ -102,20 +102,38 @@
<delete dir="${build-dir}/example"></delete>
</target>
<target name="dobuild" depends="check-uptodate, build-lib, plugins" unless="uptodate.main">
<target name="dobuild" depends="check-uptodate, flowplayer.js, build-lib, plugins" unless="uptodate.main">
<antcall target="prepare"/>
<property name="licenselib" value="${lib-dir}/licensekey"/>
<antcall target="compile"/>
<example player-swf="${player-binary-versioned}" example-dir="example-free"/>
</target>
<target name="dobuild-all" depends="check-uptodate, build-lib, plugins-all" unless="uptodate.main">
<target name="dobuild-all" depends="check-uptodate, flowplayer.js, build-lib, plugins-all" unless="uptodate.main">
<antcall target="prepare"/>
<property name="licenselib" value="${lib-dir}/licensekey"/>
<antcall target="compile"/>
<example player-swf="${player-binary-versioned}" example-dir="example-free"/>
</target>
<target name="concat-flowplayer.js">
<concat destfile="${dist-dir}/flowplayer.js">
<fileset dir="${src-js}/flowplayer.js" includes="flowplayer-src.js"/>
<fileset dir="${src-js}"
includes="flashembed.js"/>
</concat>
</target>
<target name="flowplayer.js" depends="concat-flowplayer.js">
<ant antfile="js.xml" target="min">
<property name="source.file" value="${dist-dir}/flowplayer.js" />
<property name="target.file" value="${dist-dir}/flowplayer-${flowplayer-js-version-info}.js" />
<property name="target.dir" value="dist"/>
<property name="yui.path" value="lib/yuicompressor-2.4.2.jar"/>
</ant>
</target>
<target name="deploy" if="deploy.dir" description="copies swf and js to deploy dirs" depends="jsplugins">
<copy todir="${deploy.dir}" overwrite="true" verbose="true">
<fileset dir="${build-dir}">
......@@ -468,7 +486,7 @@
<!--<include name="flowplayer-${flowplayer-js-version-info}.min.js" />-->
<include name="README.txt"/>
</zipfileset>
<zipfileset prefix="flowplayer" dir="${src-js}/flowplayer.js">
<zipfileset prefix="flowplayer" dir="${dist-dir}">
<include name="flowplayer-${flowplayer-js-version-info}.min.js"/>
</zipfileset>
<zipfileset prefix="flowplayer" dir="@{player-swf-dir}">
......@@ -555,6 +573,7 @@
<ant target="zip-biz"/>
<ant target="zip-devkit"/>
<ant target="source-dist"/>
<!--<copy file="${src-js}/flowplayer.js/flowplayer-${flowplayer-js-version-info}.min.js" todir="${dist-dir}" />-->
</target>
<target name="all-dist" description="Create distribution packages for all plugins">
......
......@@ -17,7 +17,7 @@
<!-- target dir is dynamic -->
<var name="target.dir" value="${basedir}/../../../flash-build/dist"/>
<property name="target.dir" value="${basedir}/../../../flash-build/dist"/>
<if>
<contains string="${basedir}" substring="/tools/"/>
......
......@@ -64,15 +64,15 @@
</echo>
<echo file="${yaml-file}" append="true" message=" swf:">
</echo>
<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
<echo file="${yaml-file}" append="true" message=" base: swf_base">
</echo>
<echo file="${yaml-file}" append="true" message=" js:">
</echo>
<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
<echo file="${yaml-file}" append="true" message=" base: js_base">
</echo>
<echo file="${yaml-file}" append="true" message=" zip:">
</echo>
<echo file="${yaml-file}" append="true" message=" base: ${urlbase}">
<echo file="${yaml-file}" append="true" message=" base: zip_base">
</echo>
<echo file="${yaml-file}" append="true" message="versions:">
......@@ -125,6 +125,10 @@
<property name="dist-file" value="${basedir}/dist/dist.yaml" />
<delete file="${dist-file}" />
<echo file="${dist-file}" append="true" message="flowplayer.js:${line.separator}" />
<echo file="${dist-file}" append="true" message=" folder: flowplayer${line.separator}" />
<echo file="${dist-file}" append="true" message=" files:${line.separator}" />
<echo file="${dist-file}" append="true" message=" - flowplayer-${flowplayer-js-version-info}.min.js${line.separator}" />
<echo file="${dist-file}" append="true" message="flowplayer:${line.separator}" />
<echo file="${dist-file}" append="true" message=" folder: flowplayer${line.separator}" />
<echo file="${dist-file}" append="true" message=" files:${line.separator}" />
......
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