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

build updates for 14.4.1-1n11

Browse source 
Former-commit-id: 2858890952 [formerly b18be7aaf6]
Former-commit-id: 6885f23968
This commit is contained in:
AWIPS User 2015-06-23 20:43:12 -06:00
parent 41078dd86b
commit aba414b416
4 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<property name="build.arch" <property name="build.arch"
value="x86_64" /> value="x86_64" />
<property name="lightning" <property name="lightning"
value="false" /> value="true" />
<property name="pde.build.script" <property name="pde.build.script"
value="./org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" /> value="./org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" />

44
localization/localization.OAX/utility/cave_static/site/OAX/bundles/scales/scalesInfo.xml
View file

@ -19,21 +19,53 @@
further_licensing_information. further_licensing_information.
--> -->
<mapScales> <mapScales>
<mapScale displayName="N. Hemisphere" fileName="NHemisphere.xml"> <mapScale displayName="N Hemisphere" fileName="NHemisphere.xml" areaScale="false">
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView1"/> <partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView1"/>
</mapScale> </mapScale>
<mapScale displayName="North American" fileName="NorthAmerican.xml"> <mapScale displayName="N America" fileName="NorthAmerican.xml" areaScale="false">
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView2"/> <partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView2"/>
</mapScale> </mapScale>
<mapScale displayName="CONUS" fileName="CONUS.xml"> <mapScale displayName="CONUS" fileName="CONUS.xml" areaScale="false">
<partId view="false" id="com.raytheon.viz.ui.glmap.GLMapEditor"/> <partId view="false" id="com.raytheon.viz.ui.glmap.GLMapEditor"/>
</mapScale> </mapScale>
<mapScale displayName="Regional" fileName="Regional.xml"> <mapScale displayName="Regional" fileName="Regional.xml" areaScale="false">
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView3"/> <partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView3"/>
</mapScale> </mapScale>
<mapScale displayName="State(s)" fileName="States.xml"> <mapScale displayName="State" fileName="States.xml" areaScale="false">
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView4"/> <partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView4"/>
</mapScale> </mapScale>
<mapScale displayName="WFO" fileName="WFO.xml"> <mapScale displayName="WFO" fileName="WFO.xml" areaScale="false">
</mapScale>
<mapScale displayName="World" fileName="World.xml" areaScale="false">
</mapScale>
<mapScale displayName="SAT/Arctic" fileName="Arctic.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Antarctic" fileName="Antarctic.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/NEXRCOMP" fileName="NEXRAD.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Alaska National" fileName="Alaska-National.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Alaska Regional" fileName="Alaska-Regional.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/East CONUS" fileName="East-CONUS.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/West CONUS" fileName="West-CONUS.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Hawaii National" fileName="Hawaii-National.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Hawaii Regional" fileName="Hawaii-Regional.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Puerto Rico National" fileName="Puerto-Rico-National.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Puerto Rico Regional" fileName="Puerto-Rico-Regional.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Supernational" fileName="Supernational.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/GOES-Sounder" fileName="SOUNDER.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/Mollweide" fileName="Mollweide.xml" areaScale="true">
</mapScale>
<mapScale displayName="SAT/GOES-East-West" fileName="GEWCOMP.xml" areaScale="true">
</mapScale> </mapScale>
</mapScales> </mapScales>

4
rpms/awips2.upc/Installer.edex-upc/component.spec
View file

@ -44,7 +44,7 @@ fi
# create build root directory # create build root directory
rm -rf ${RPM_BUILD_ROOT}/awips2 rm -rf ${RPM_BUILD_ROOT}/awips2
mkdir -p ${RPM_BUILD_ROOT}/awips2/tools/bin mkdir -p ${RPM_BUILD_ROOT}/awips2/tools/bin
/bin/cp %{_baseline_workspace}/rpms/awips2.upc/Installer.edex-upc/programs/* ${RPM_BUILD_ROOT}/awips2/tools/bin/ /bin/cp -r %{_baseline_workspace}/rpms/awips2.upc/Installer.edex-upc/programs/* ${RPM_BUILD_ROOT}/awips2/tools/bin/
%pre %pre
@ -60,4 +60,4 @@ rm -rf ${RPM_BUILD_ROOT}/*
%attr(755,awips,fxalpha) /awips2/tools/bin/edex %attr(755,awips,fxalpha) /awips2/tools/bin/edex
%attr(755,awips,fxalpha) /awips2/tools/bin/arinfo %attr(755,awips,fxalpha) /awips2/tools/bin/arinfo
%attr(755,awips,fxalpha) /awips2/tools/bin/areas %attr(755,awips,fxalpha) /awips2/tools/bin/areas
%attr(644,awips,fxalpha) /awips2/tools/bin/imgtyp.tbl %attr(644,awips,fxalpha) /awips2/tools/bin/sat/imgtyp.tbl

2
rpms/unidata/buildEnvironment.sh
View file

@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is... # baseline is...
export BASELINE="${JENKINS_WORKSPACE}" export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="14.4.1" export AWIPSII_VERSION="14.4.1"
export BUILD_NUMBER="8" export BUILD_NUMBER="11"
export AWIPSII_RELEASE="1n${BUILD_NUMBER}" export AWIPSII_RELEASE="1n${BUILD_NUMBER}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir" export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"