xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be built into an RPM for Work Assignments." into omaha_14.4.1

Browse source 
Former-commit-id: 1db96f8ae03936ea8d3ce43e95fc9940485b040c
This commit is contained in:
Richard Peter 2014-08-07 16:49:37 -05:00 • committed by Gerrit Code Review
commit a009e70cdf
2 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cave/build/p2-build.xml
View file

@ -113,6 +113,12 @@
<fileset dir="${workspace.dir}" <fileset dir="${workspace.dir}"
includes="it.*/**" /> includes="it.*/**" />
</copy> </copy>
<echo message="PLUGINS: v*/**" />
<copy todir="${basedir}/cave/p2/plugins">
<fileset dir="${workspace.dir}"
includes="v*/**" />
</copy>
<echo message="PLUGINS: ch.*/**" /> <echo message="PLUGINS: ch.*/**" />
<copy todir="${basedir}/cave/p2/plugins"> <copy todir="${basedir}/cave/p2/plugins">
@ -352,7 +358,38 @@
</for> </for>
</target> </target>
<target name="main" depends="clean, p2.build, wa-build" /> <target name="wa-cleanup" depends="wa-build" description="Removes references to WA-specific features that should not be built as an RPM.">
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features.ignore" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features.ignore}" param="wa.feature">
<sequential>
<if>
<available file="${basedir}/cave/p2/features/@{wa.feature}" type="dir" />
<then>
<!-- Remove the feature directory. -->
<delete includeemptydirs="true">
<fileset dir="${basedir}/cave/p2/features/@{wa.feature}" />
</delete>
<!-- Remove references to the feature from features.txt -->
<exec executable="/bin/sed" output="${basedir}/cave/p2/dist/features.txt.tmp">
<arg value="/@{wa.feature}/d" />
<arg value="${basedir}/cave/p2/dist/features.txt" />
</exec>
<move file="${basedir}/cave/p2/dist/features.txt.tmp"
tofile="${basedir}/cave/p2/dist/features.txt" />
</then>
</if>
</sequential>
</for>
</sequential>
</for>
</target>
<target name="main" depends="clean, p2.build, wa-build, wa-cleanup" />
<target name="p2.build.repo"> <target name="p2.build.repo">
<!-- Copy The Feature --> <!-- Copy The Feature -->

35
edexOsgi/build.edex/build.xml
View file

@ -158,8 +158,43 @@
</sequential> </sequential>
</for> </for>
<antcall target="wa-cleanup" />
<antcall target="clean" /> <antcall target="clean" />
</target> </target>
<target name="wa-cleanup" description="Removes references to WA-specific features that should not be built as an RPM.">
<for param="wa.feature.list.file">
<fileset dir="${basedir}" includes="*-wa-build.properties" />
<sequential>
<var name="wa.features.ignore" unset="true" />
<property file="@{wa.feature.list.file}" />
<for list="${wa.features.ignore}" param="wa.feature">
<sequential>
<propertyregex property="edex.component"
override="true"
input="@{wa.feature}"
regexp="\."
replace="-" />
<propertyregex property="edex.component"
override="true"
input="${edex.component}"
regexp="com-raytheon-uf-(.+)-feature"
select="\1" />
<if>
<available file="${basedir}/edex/dist/${edex.component}.zip" />
<then>
<!-- Remove the feature zip file. -->
<delete file="${basedir}/edex/dist/${edex.component}.zip"
failonerror="true" />
</then>
</if>
</sequential>
</for>
</sequential>
</for>
</target>
<target name="main" depends="clean, main-build, wa-build" /> <target name="main" depends="clean, main-build, wa-build" />