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

Fix to minify flowplayer.js correctly into the flash-build/dist dir.

parent 3782c2c1
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
......@@ -20,9 +20,12 @@ 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), captions (3.2.10), viralvideos (3.2.14)
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,captions/build.xml,viralvideos/build.xml,sharing/build.xml
#plugin.buildfiles=controls/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
......
......@@ -5,7 +5,7 @@
<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.17-dev" />
<property name="secondaries-file" value="../tld/secondary" />
<property file="${player-version}.properties" />
......@@ -468,7 +468,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}">
......@@ -549,13 +549,13 @@
</zip>
</target>
<target name="dist" description="Create distribution packages" depends="build-all">
<iterate-plugins target="dist" buildfiles="${allplugins.buildfiles}"/>
<target name="dist" description="Create distribution packages">
<!--<iterate-plugins target="dist" buildfiles="${allplugins.buildfiles}"/>-->
<ant target="zip"/>
<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}" />
<!--<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/"/>
......
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