Revision: 4116
Author: solomax666
Date: Sat Aug 27 07:16:44 2011
Log: - Issue 1455: remove duplicated JARs from red5-screenshare
http://code.google.com/p/openmeetings/source/detail?r=4116
Deleted:
/branches/dev/injection/WebContent/red5-screenshare/red5-screenshare.jar
/branches/dev/injection/server/red5/webapps/openmeetings/red5-screenshare
Modified:
/branches/dev/injection/build.xml
=======================================
---
/branches/dev/injection/WebContent/red5-screenshare/red5-screenshare.jar
Fri Jan 22 07:10:25 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/dev/injection/build.xml Sun Aug 21 02:57:06 2011
+++ /branches/dev/injection/build.xml Sat Aug 27 07:16:44 2011
@@ -11,10 +11,9 @@
<!-- screen.out.dir -->
<property name="screen.out.dir" value="${basedir}/screen_compile" />
-
<!-- screen.src.dir -->
<property name="screen.src.dir" value="${basedir}/src/red5-screenshare"
/>
-
+
<!-- hudson config -->
<property environment="env" />
@@ -38,6 +37,9 @@
<!-- Distribution properties -->
<property name="project.distname" value="openmeetings"/>
+ <!-- screenshare.out.dir -->
+ <property name="screenshare.out.dir"
value="${dist.dir}/red5/webapps/${project.distname}/red5-screenshare" />
+
<!-- libraries -->
<property name="project.lib" value="${basedir}/lib"/>
@@ -137,6 +139,9 @@
<target name="prepare">
<mkdir dir="${screen.out.dir}" />
<mkdir dir="${dist.dir}" />
+ <copy todir="${screenshare.out.dir}" filtering="true">
+ <fileset dir="${screenshare.lib}" />
+ </copy>
<copy todir="${dist.dir}" filtering="true">
<fileset dir="server">
<exclude name="**/*.fla"/>
@@ -158,11 +163,6 @@
</fileset>
</copy>
- <!--
- <copy file="${openjpa.lib}/openjpa-all-2.1.0.jar"
todir="${dist.dir}/red5/lib"/>
- <copy file="${openjpa.lib}/dom4j-1.6.1.jar"
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib"/>
- -->
-
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/red5-services">
<fileset dir="${webcontent.src.dir}/WEB-INF/red5-services"
includes="*.xml"/>
</copy>
@@ -213,8 +213,7 @@
<!-- add templates -->
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/classes">
- <fileset dir="src/templates">
- </fileset>
+ <fileset dir="src/templates" />
</copy>
<tstamp/>
@@ -368,7 +367,7 @@
</manifest>
</jar>
<!-- Screen Share -->
- <jar
destfile="${dist.dir}/red5/webapps/${project.distname}/red5-screenshare/red5-screenshare.jar">
+ <jar destfile="${screenshare.out.dir}/red5-screenshare.jar">
<fileset dir="${screen.out.dir}">
<include name="**/**"/>
</fileset>
@@ -404,9 +403,8 @@
<include name="**/*.jar" />
</fileset>
- <fileset
dir="${dist.dir}/red5/webapps/${project.distname}/red5-screenshare" >
+ <fileset dir="${screenshare.out.dir}" >
<include name="**/*.jar" />
-
</fileset>
</path>
</signjar>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
