Merge branch 'master_13.5.3' into omaha_13.5.3

Former-commit-id: 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 0ca3c86388 [formerly 9923b2c71a] [formerly b62ab264f0] [formerly 4190ddf39b [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]]]]
Former-commit-id: 4190ddf39b
Former-commit-id: 73966efbac [formerly 0822dd1682] [formerly 97466112f596932da4595e1e089695d5218ac848 [formerly 590d7de15d]]
Former-commit-id: 15faa0e793049cadddac2fa8f2a95f68cf78ae28 [formerly d4f5c58a4c]
Former-commit-id: d9479c586d
This commit is contained in:
Steve Harris 2013-11-11 11:40:03 -06:00
commit ec1c09b1f1
2 changed files with 4 additions and 4 deletions

View file

@ -401,12 +401,12 @@ if [ "${1}" = "-custom" ]; then
#buildRPM "awips2-ant"
#buildRPM "awips2-adapt-native"
#buildRPM "awips2-common-base"
buildRPM "awips2-common-base"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-java"
buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-rcm"
#buildRPM "awips2-tools"

View file

@ -281,12 +281,12 @@ if [ "${1}" = "-custom" ]; then
#buildRPM "awips2-adapt-native"
#buildRPM "awips2-ant"
#buildRPM "awips2-common-base"
buildRPM "awips2-common-base"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-hydroapps-shared"
#buildRPM "awips2-java"
buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-tools"
exit 0