Commit 821d3d6a authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

generates new dist.yaml with info on files to be released within the current release

parent 09f11c87
......@@ -22,6 +22,9 @@ deploy.dir=${site.dir}/content/swf
plugin.buildfiles=rtmp/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
sharing/build.xml,viralvideos/build.xml,bitrateselect/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml \
httpstreaming/build.xml,menu/build.xml,pseudostreaming/build.xml
jsplugins.buildfiles=bitrateselect/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, \
......@@ -35,7 +38,7 @@ allplugins.buildfiles=analytics/build.xml,audio/build.xml,bwcheck/build.xml,bwch
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
alljsplugins.buildfiles=controls/build.xml,embed/build.xml,ipad/build.xml,playlist/build.xml,bitrateselect/build.xml
cloudfront.version=1.0
adsense.version=flowplayer.org-1.6.1
......
......@@ -104,6 +104,13 @@
<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">
<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="deploy" if="deploy.dir" description="copies swf and js to deploy dirs" depends="jsplugins">
<copy todir="${deploy.dir}" overwrite="true">
<fileset dir="${build-dir}">
......@@ -113,7 +120,8 @@
<iterate-plugins target="deploy" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins" />
</target>
<target name="build" description="builds all" depends="dobuild, deploy" />
<target name="build" description="builds the free version, and plugins listed in build.properties" depends="dobuild, deploy" />
<target name="build-all" description="builds all" depends="dobuild-all, build-biz"/>
<target name="build-biz" description="builds all" depends="check-uptodate, build-lib, plugins"
unless="uptodate.commercial">
......@@ -123,7 +131,6 @@
<example player-swf="${commercial-player-binary-versioned}" example-dir="example-biz"/>
</target>
<target name="build-all" description="builds all" depends="build, build-biz"/>
<target name="zip-bundled">
<antcall target="prepare"/>
......@@ -336,6 +343,12 @@
<target name="plugins" description="Build all plugins">
<iterate-plugins target="deploy"/>
<iterate-plugins target="min" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
</target>
<target name="plugins-all" description="Build all plugins">
<iterate-plugins target="deploy" buildfiles="${allplugins.buildfiles}"/>
<iterate-plugins target="min" buildfiles="${alljsplugins.buildfiles}" basedirectory="../js-plugins"/>
</target>
<target name="plugin-names" description="Echoes all plugin names">
......@@ -361,6 +374,7 @@
<property name="keyfile" value="${keyfile}"/>
<property name="url-file" value="${url-file}"/>
<property name="yaml-file" value="${yaml-file}"/>
<property name="dist-file" value="${dist-file}" />
<property name="devkit-dir" value="../${devkit-dir}"/>
<property name="js.deploy.dir" value="${js.deploy.dir}"/>
<property name="mxmlc-bin" value="${mxmlc-bin}" />
......@@ -406,6 +420,8 @@
license="LICENSE.txt" example-dir="example-free"/>
<copy file="${dist-dir}/${dist-name}" tofile="${dist-dir}/flowplayer.zip" />
<copy file="${dist-dir}/${dist-name}" tofile="${dist-dir}/${dist-target-name}" />
<copy file="${build-dir}/${player-binary}" todir="${dist-dir}" />
<copy file="${build-dir}/${player-binary-versioned}" todir="${dist-dir}" />
</target>
<target name="zip-biz" description="creates a Commercial distribution zip package">
......@@ -414,7 +430,8 @@
example-dir="example-biz"/>
<copy file="${dist-dir}/${commercial-dist-name}" tofile="${dist-dir}/flowplayer.commercial.zip" />
<copy file="${dist-dir}/${commercial-dist-name}" tofile="${dist-dir}/${commercial-dist-target-name}" />
<copy file="${build-dir}/${commercial-player-binary}" todir="${dist-dir}" />
<copy file="${build-dir}/${commercial-player-binary-versioned}" todir="${dist-dir}" />
<zip-player zip-name="${multidomain-dist-name}" player-swf-dir="${build-dir}"
player-swf="${commercial-player-binary-versioned}" license="LICENSE_MULTIDOMAIN.txt"
......
......@@ -175,7 +175,7 @@
</echo>
</target>
<target name="generate-release-yaml" description="Generates a YAML formatted file containing URLs to all released/uploaded plugins" depends="jsplugins">
<target name="generate-release-yaml" description="Generates a YAML formatted file containing of all distribution files">
<length property="flowplayer.filesize" file="${dist-dir}/${dist-name}" />
<length property="flowplayer-commercial.filesize" file="${dist-dir}/${commercial-dist-name}" />
<length property="devkit.filesize" file="${dist-dir}/${devkit-dist-name}" />
......@@ -238,8 +238,30 @@
<echo file="${yaml-file}" append="true" message=" flowplayer.commercial.zip: ${flowplayer-commercial.filesize}">
</echo>
<iterate-plugins target="write-filesize" buildfiles="${allplugins.buildfiles}" />
<iterate-plugins target="write-filesize" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
<iterate-plugins target="write-filesize" buildfiles="${alljsplugins.buildfiles}" basedirectory="../js-plugins"/>
</target>
<target name="generate-dist-yaml" description="Generates a YAML file containing names of all plugins that are part of this release">
<property name="dist-file" value="${basedir}/dist/dist.yaml" />
<delete file="${dist-file}" />
<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}" />
<echo file="${dist-file}" append="true" message=" - ${player-binary}${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${player-binary-versioned}${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${commercial-player-binary}${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${commercial-player-binary-versioned}${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${dist-name}${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${commercial-dist-name}${line.separator}" />
<echo file="${dist-file}" append="true" message="flowplayer.devkit:${line.separator}" />
<echo file="${dist-file}" append="true" message=" folder: flowplayer.devkit${line.separator}" />
<echo file="${dist-file}" append="true" message=" files:${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${devkit-dist-name}${line.separator}" />
<iterate-plugins target="write-dist-info" />
<iterate-plugins target="write-dist-info" buildfiles="${jsplugins.buildfiles}" basedirectory="../js-plugins"/>
</target>
</project>
\ No newline at end of file
......@@ -18,7 +18,7 @@
<!-- target dir is dynamic -->
<var name="target.dir" value="${basedir}/../../core/build"/>
<var name="target.dir" value="${basedir}/../../core/dist"/>
<if>
<contains string="${basedir}" substring="/tools/"/>
......@@ -97,6 +97,14 @@
<echo file="${yaml-file}" append="true" message=" ${basename}.js: ${filesize}${line.separator}" />
</target>
<target name="write-dist-info">
<echo file="${dist-file}" append="true" message="${basename}:${line.separator}" />
<echo file="${dist-file}" append="true" message=" folder: ${basename}${line.separator}" />
<echo file="${dist-file}" append="true" message=" files:${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${basename}.js${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${basename}.min.js${line.separator}" />
</target>
<target name="deploy" if="js.deploy.dir">
<property name="target.file" value="${target.dir}/${basename}-${version}.min.js"/>
<echo message="copying ${target.file}" />
......
......@@ -319,6 +319,14 @@
<echo file="${yaml-file}" append="true" message=" ${basename}.zip: ${zip.filesize}${line.separator}" />
</target>
<target name="write-dist-info">
<echo file="${dist-file}" append="true" message="${basename}:${line.separator}" />
<echo file="${dist-file}" append="true" message=" folder: ${releasedir}${line.separator}" />
<echo file="${dist-file}" append="true" message=" files:${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${basename}-${version}.zip${line.separator}" />
<echo file="${dist-file}" append="true" message=" - ${basename}-${version}.swf${line.separator}" />
</target>
<target name="source-zip" depends="prepare" unless="pluginproxy">
<zip destfile="${dist-dir}/${basename}-${version}-src.zip">
<zipfileset prefix="${basename}" dir=".">
......
......@@ -17,4 +17,5 @@
<property name="compiler-define" value="CONFIG::skin,'true' -define=CONFIG::hasSlowMotion,'false'" />
<property name="extra-sources" value="../../lib/common/src/actionscript" />
</project>
\ No newline at end of file
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