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

Issue #2164 - fix 13.6.1 build

Browse source 
Former-commit-id: 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371
This commit is contained in:
Bryan Kowal 2013-08-13 11:09:54 -05:00
parent 60831564a0
commit 586b7646f0
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cave/build/alertviz/customTargets.xml
View file

@ -168,14 +168,6 @@
<!-- Steps to do after running assemble. --> <!-- Steps to do after running assemble. -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
<target name="postAssemble"> <target name="postAssemble">
<copy todir="${buildDirectory}/../../static/common/alertviz/etc"
verbose="true">
<fileset dir="${buildDirectory}/../../static/common/cave/etc">
<include name="alertViz*/**" />
<include name="monitorIcons/**" />
</fileset>
</copy>
<!-- Update the 32-bit linux AlertViz zip with static files --> <!-- Update the 32-bit linux AlertViz zip with static files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip" <zip destfile="${buildDirectory}/${buildLabel}/${buildId}-linux.gtk.x86.zip"
update="true"> update="true">
@ -205,14 +197,7 @@
<fileset dir="${buildDirectory}/../../static/win32.x86" <fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="cave/**" /> excludes="cave/**" />
</zip> </zip>
<delete includeEmptyDirs="true">
<fileset dir="${buildDirectory}/../../static/common/alertviz/etc">
<include name="alertViz*/**" />
<include name="monitorIcons/**" />
</fileset>
</delete>
</target> </target>

4
rpms/awips2.cave/Installer.alertviz/component.spec
View file

@ -140,8 +140,6 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/alertviz/alertviz.ini /awips2/alertviz/alertviz.ini
%dir /awips2/alertviz/configuration %dir /awips2/alertviz/configuration
/awips2/alertviz/configuration/* /awips2/alertviz/configuration/*
%dir /awips2/alertviz/etc
/awips2/alertviz/etc/*
%dir /awips2/alertviz/features %dir /awips2/alertviz/features
/awips2/alertviz/features/* /awips2/alertviz/features/*
%doc /awips2/alertviz/*.pdf %doc /awips2/alertviz/*.pdf
@ -154,4 +152,4 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/alertviz/*.so /awips2/alertviz/*.so
/awips2/alertviz/*.sh /awips2/alertviz/*.sh
%attr(644,root,root) /etc/xdg/autostart/awips2-alertviz.desktop %attr(644,root,root) /etc/xdg/autostart/awips2-alertviz.desktop