Bryan Kowal
|
6494e3e627
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 137b27d3ff [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 3e1556a981
Former-commit-id: a34225c4c9
|
2012-09-05 14:44:36 -05:00 |
|
Steve Harris
|
e9582cb789
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: bba4eb12d0 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: af106f1d29
Former-commit-id: 53e29f59e4
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
d65f35ffe9
|
12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
38aa573545
|
12.9.1-12 baseline
Former-commit-id: 948766c387 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 150bc967a5
Former-commit-id: 9311c1737e
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
5b4ee818b7
|
Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 3a9d4961e2 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]
Former-commit-id: 34cbde4124
Former-commit-id: 3230e0b246
|
2012-08-30 14:40:34 -05:00 |
|
Steve Harris
|
5bb474d33c
|
12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
445d1a6a0d
|
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: d38f8b80f0 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
|
2012-08-21 16:17:58 -05:00 |
|
Steve Harris
|
9b5c2094ed
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Bryan Kowal
|
9ebeabe2cf
|
Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d
Former-commit-id: e31fd00613 [formerly e31fd00613 [formerly b66b6fd7498e441290772be4b6906e58ac385511]]
Former-commit-id: 2011493fda
Former-commit-id: 8b44fbfb4f
|
2012-07-25 14:13:35 -05:00 |
|
Bryan Kowal
|
de1d59a174
|
Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: db6b535eb6 [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 46198b0c92
|
2012-07-12 12:58:40 -05:00 |
|
Bryan Kowal
|
8d6415ee35
|
Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.
Former-commit-id: b79f5a3c2b [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]
Former-commit-id: c7a172f97a
Former-commit-id: 7ace6b7acb
|
2012-07-11 09:42:46 -05:00 |
|
Bryan Kowal
|
212afcceea
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 99d22f395a [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
|
2012-07-10 16:57:16 -05:00 |
|
Steve Harris
|
d5fa61041b
|
12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
611925412d
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a33740e915 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
75f77df418
|
Revert "12.6.1-10 baseline"
This reverts commit aecc6a8474 [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: b4b1f6975f [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
aecc6a8474
|
12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
2838ca117f
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 2f20a86a30 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
ca8baf18a3
|
12.6.1-3 baseline
Former-commit-id: 42f3513175 [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
9054c5ab6c
|
12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
2738af2019
|
12.5.1-6 baseline
Former-commit-id: 24474489f9 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
|
2012-05-16 16:41:22 -05:00 |
|
Bryan Kowal
|
7f6a6ff856
|
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: ea8bf623cf [formerly ea8bf623cf [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]
Former-commit-id: fbb694b48e
Former-commit-id: f7cba22ee2
|
2012-05-10 09:24:56 -05:00 |
|
Steve Harris
|
15c56d11bc
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
dafb6b18d8
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 65e1e4ee0b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
21d2361f00
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
9ceb347a77
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 43c3807a32 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]
Former-commit-id: 9d64e1df12
Former-commit-id: 06187b93be
|
2012-01-18 16:00:45 -06:00 |
|
root
|
377dcd10b9
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|