Author: solomax
Date: Thu Mar 1 16:28:33 2012
New Revision: 1295655
URL: http://svn.apache.org/viewvc?rev=1295655&view=rev
Log:
Build improvements: svnkit moved to ivy, copy/paste reduced, copying od
red5-screenshare jars is fixed
Added:
incubator/openmeetings/trunk/singlewebapp/lib/svnClientAdapter-1.3.1.jar
(with props)
incubator/openmeetings/trunk/singlewebapp/lib/svnant-1.3.1.jar (with
props)
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
incubator/openmeetings/trunk/singlewebapp/lib/ (props changed)
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1295655&r1=1295654&r2=1295655&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Mar 1 16:28:33 2012
@@ -93,18 +93,10 @@
<property name="junit.lib.dir" value="${project.lib}/junit" />
<property name="rat.lib.dir" value="${project.lib}/rat" />
<property name="dtd-generator.lib.dir"
value="${project.lib}/dtd-generator" />
+ <property name="svntask.lib.dir" value="${project.lib}/svntask" />
<property name="red5.lib" value="${basedir}/${red5.server.dir}/dist" />
<property name="red5.server.lib" value="${red5.lib}/lib" />
- <property name="spring.lib" value="${project.lib}/spring" />
- <property name="upload.lib" value="${project.lib}/upload" />
- <property name="xstream.lib" value="${project.lib}/xstream" />
- <property name="web.lib" value="${project.lib}" />
- <!-- Svn Task -->
- <property name="svntask.lib" value="${project.lib}/svntask-1.0.8" />
-
- <!-- JDK Tools -->
- <property name="jdk.tools" value="${project.lib}/java_16_jdk" />
<!-- compile classpath -->
<path id="compile.classpath">
@@ -120,7 +112,7 @@
<tstamp>
<format property="build.time" pattern="dd-MM-yyyy_HHmm"
/>
</tstamp>
- <property name="archive.file.name"
value="${dist.dir}/${project.distname}-${version.number}.r${svn.version}-${build.time}"
/>
+ <property name="archive.file.name"
value="${dist.dir}/${project.distname}-${version.number}.r${svn.info.rev}-${build.time}"
/>
<tar longfile="gnu" compression="gzip"
destfile="${archive.file.name}-src.tar.gz">
<tarfileset dir="${basedir}">
@@ -149,44 +141,25 @@
</target>
<!-- build webapp -->
-
- <target name="dist" description="binary distribution of OpenMeetings"
- depends="cleanForBinary, jar, compile.laszlo.main,
compile.laszlo.main.as3, enhance, signWebStartJars">
-
+ <target name="-copy-libraries" description="All jars downloaded by ivy
copied to appropriate places">
<copy todir="${dist.dir}/red5/lib">
<fileset dir="${red5.lib.dir}" includes="*.jar" />
</copy>
<copy todir="${dist.webapps.dir}/WEB-INF/lib">
<fileset dir="${om.lib.dir}" includes="*.jar" />
</copy>
-
</target>
+
+ <target name="dist" description="binary distribution of OpenMeetings"
+ depends="cleanForBinary, jar, compile.laszlo.main,
compile.laszlo.main.as3, enhance, signWebStartJars, -copy-libraries"/>
<!-- compiles the sources without the laszlo client -->
<target name="dist-test" description="binary distribution of
OpenMeetings"
- depends="cleanForBinary, jar, signWebStartJars">
-
- <copy todir="${dist.dir}/red5/lib">
- <fileset dir="${red5.lib.dir}" includes="*.jar" />
- </copy>
- <copy todir="${dist.webapps.dir}/WEB-INF/lib">
- <fileset dir="${om.lib.dir}" includes="*.jar" />
- </copy>
-
- </target>
+ depends="cleanForBinary, jar, signWebStartJars,
-copy-libraries"/>
<!-- compiles the sources only with laszlo debug client -->
<target name="dist-debug" description="binary distribution of
OpenMeetings"
- depends="cleanForBinary, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, signWebStartJars">
-
- <copy todir="${dist.dir}/red5/lib">
- <fileset dir="${red5.lib.dir}" includes="*.jar" />
- </copy>
- <copy todir="${dist.webapps.dir}/WEB-INF/lib">
- <fileset dir="${om.lib.dir}" includes="*.jar" />
- </copy>
-
- </target>
+ depends="cleanForBinary, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, signWebStartJars, -copy-libraries"/>
<target name="prepare.mkdir" depends="-java6.check">
<mkdir dir="${screen.out.dir}" />
@@ -198,6 +171,7 @@
<mkdir dir="${junit.lib.dir}" />
<mkdir dir="${rat.lib.dir}" />
<mkdir dir="${dtd-generator.lib.dir}" />
+ <mkdir dir="${svntask.lib.dir}" />
</target>
<condition property="db.provider" value="${db}" else="derby">
@@ -206,21 +180,6 @@
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
- <copy todir="${screenshare.out.dir}" filtering="true">
- <fileset dir="${red5-screenshare.images}" />
- <fileset dir="${red5.lib.dir}"
includes="commons-codec*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="httpclient*.jar" />
- <fileset dir="${red5.lib.dir}" includes="httpcore*.jar"
/>
- <fileset dir="${red5.lib.dir}"
includes="bcprov-jdk16*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="ehcache-core*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="commons-beanutils*.jar" />
- <fileset dir="${red5.server.dir}/dist"
includes="red5.jar" />
- <fileset dir="${red5.lib.dir}"
includes="org.springframework.context-*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="org.springframework.core-*.jar" />
- <fileset dir="${red5.lib.dir}" includes="logback*.jar"
/>
- <fileset dir="${red5.lib.dir}"
includes="mina-core*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="com.springsource.slf4j.api*.jar" />
- </copy>
<copy todir="${red5.root}" filtering="true">
<fileset dir="${red5.server.dir}/dist">
<exclude name="**/*.fla" />
@@ -334,7 +293,7 @@
<attribute name="Built-By" value="OpenMeetings
- http://openmeetings.googlecode.com"; />
<attribute name="Built-On"
value="${build.TODAY}" />
<attribute name="Class-Path" value="conf/
${jar.classpath}" />
- <attribute name="Svn-Revision"
value="${svn.version}" />
+ <attribute name="Svn-Revision"
value="${svn.info.rev}" />
</manifest>
</jar>
<jar
destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-templates.jar">
@@ -403,6 +362,21 @@
<param name="C" value="DE" />
</dname>
</genkey>
+ <copy todir="${screenshare.out.dir}" filtering="true">
+ <fileset dir="${red5-screenshare.images}" />
+ <fileset dir="${red5.lib.dir}"
includes="commons-codec*.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="httpclient*.jar" />
+ <fileset dir="${red5.lib.dir}" includes="httpcore*.jar"
/>
+ <fileset dir="${red5.lib.dir}"
includes="bcprov-jdk16*.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="ehcache-core*.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="commons-beanutils*.jar" />
+ <fileset dir="${red5.server.dir}/dist"
includes="red5.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="org.springframework.context-*.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="org.springframework.core-*.jar" />
+ <fileset dir="${red5.lib.dir}" includes="logback*.jar"
/>
+ <fileset dir="${red5.lib.dir}"
includes="mina-core*.jar" />
+ <fileset dir="${red5.lib.dir}"
includes="com.springsource.slf4j.api*.jar" />
+ </copy>
<signjar alias="filetest" keystore="filetest.keystore"
storepass="secret" lazy="false">
<path>
<fileset dir="${screenshare.out.dir}">
@@ -547,19 +521,19 @@
<echo message="Enhancing complete." />
</target>
- <target name="current_revision">
- <typedef resource="com/googlecode/svntask/svntask.xml">
+ <target name="current_revision" depends="-retrieve-svntask">
+ <typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
<classpath>
- <fileset dir="${svntask.lib}" includes="*.jar"
/>
+ <fileset dir="${svntask.lib.dir}"
includes="*.jar" />
+ <fileset dir="${project.lib}"
includes="svn*.jar" />
</classpath>
</typedef>
- <svn>
- <info path="." revisionProperty="svn.version" />
+ <svnSetting svnkit="false" javahl="false" id="svn.settings" />
<!-- native svn in the path-->
+ <svn refid="svn.settings">
+ <info target="."/>
</svn>
-
- <!-- Display svn revision number -->
- <echo>Current revision: ${svn.version}</echo>
+ <echo>Current revision: ${svn.info.rev}</echo>
</target>
<!-- Build entire project -->
@@ -872,6 +846,14 @@
<param name="ivy.lib.location"
value="${dtd-generator.lib.dir}"/>
</antcall>
</target>
+ <!-- Check for svntask libraries -->
+ <target name="-retrieve-svntask" unless="svntask.installed"
description="Retrieves the libraries if needed" depends="prepare.mkdir">
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="svntask"/>
+ <param name="ivy.lib.location"
value="${svntask.lib.dir}"/>
+ <param name="ivy.transitive" value="true" />
+ </antcall>
+ </target>
<target name="ivyclear" description="Clears out the Ivy cache">
<delete dir="${user.home}/.ivy2/cache/red5"/>
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1295655&r1=1295654&r2=1295655&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Thu Mar 1 16:28:33 2012
@@ -27,6 +27,7 @@
<conf name="junit" description="Unit testing dependencies" />
<conf name="rat" description="Apache Rat dependencies" />
<conf name="dtd" description="Dtd-generator dependencies" />
+ <conf name="svntask" description="Svn task dependencies" />
</configurations>
<dependencies>
<!-- START OF RED5 -->
@@ -325,6 +326,13 @@
<include type="jar" />
</dependency>
<!-- END OF DTD -->
+
+ <!-- START OF svntask -->
+ <dependency org="org.tmatesoft.svnkit" name="svnkit"
rev="1.7.0-beta2" conf="svntask->*" transitive="true">
+ <include type="jar" />
+ </dependency>
+ <!-- END OF svntask -->
+
</dependencies>
</ivy-module>
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1295655&r1=1295654&r2=1295655&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Thu Mar 1
16:28:33 2012
@@ -19,6 +19,8 @@
<ibiblio name="central" m2compatible="true"/>
<ibiblio name="springsource-external" m2compatible="true"
root="http://repository.springsource.com/maven/bundles/external"/>
<ibiblio name="springsource-release" m2compatible="true"
root="http://repository.springsource.com/maven/bundles/release"/>
+ <ibiblio name="tmatesoft-release" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/releases"/>
+ <ibiblio name="tmatesoft-snapshots" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/snapshots"/>
<url name="mavencentral">
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
</url>
Propchange: incubator/openmeetings/trunk/singlewebapp/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 1 16:28:33 2012
@@ -12,4 +12,5 @@ anakia
junit
+svntask
Added: incubator/openmeetings/trunk/singlewebapp/lib/svnClientAdapter-1.3.1.jar
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/lib/svnClientAdapter-1.3.1.jar?rev=1295655&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/lib/svnClientAdapter-1.3.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/lib/svnant-1.3.1.jar
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/lib/svnant-1.3.1.jar?rev=1295655&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/lib/svnant-1.3.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
