FreeCalypso > hg > fc-magnetite
changeset 19:88f40f4c829f
condat2 vs. condat3 includes selection logic
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Wed, 28 Sep 2016 01:37:28 +0000 |
| parents | c8bd5a927942 |
| children | 29ada88ec3cf |
| files | components/aci-classic scripts/mkcomp-test.sh |
| diffstat | 2 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/components/aci-classic Tue Sep 27 21:25:36 2016 +0000 +++ b/components/aci-classic Wed Sep 28 01:37:28 2016 +0000 @@ -65,9 +65,9 @@ # Includes -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc" CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include" CPPFLAGS="$CPPFLAGS -I../../$CDGINC" if [ "$MMI" = 2 ] @@ -452,9 +452,9 @@ # New includes -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc" CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include" CPPFLAGS="$CPPFLAGS -I../../$CDGINC" CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci" CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd" @@ -521,9 +521,9 @@ # New includes -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc" CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" -CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" +CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include" CPPFLAGS="$CPPFLAGS -I../../$CDGINC" CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci" CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ati_ext"
--- a/scripts/mkcomp-test.sh Tue Sep 27 21:25:36 2016 +0000 +++ b/scripts/mkcomp-test.sh Wed Sep 28 01:37:28 2016 +0000 @@ -10,22 +10,26 @@ USE_STR2IND=0 fi -if [ -z "$GPF" ] +if [ -z "$TCSENV" ] then - GPF=gpf2 + TCSENV=2 fi -case "$GPF" in - gpf2) +case "$TCSENV" in + 2) + CONDAT=condat2 + GPF=gpf2 CDGINC=cdg211/cdginc CDGPRIM=cdg211/prim ;; - gpf3) + 3) + CONDAT=condat3 + GPF=gpf3 CDGINC=cdg3/cdginc-conservative CDGPRIM=cdg3/sap-inline ;; *) - echo "Error: bad GPF= setting" 1>&2 + echo "Error: bad TCSENV= setting" 1>&2 exit 1 ;; esac @@ -34,6 +38,6 @@ MMI=0 SRVC=1 -export BUILD_DIR CDGINC CDGPRIM GPF GPRS MMI SRVC USE_STR2IND +export BUILD_DIR CDGINC CDGPRIM CONDAT GPF GPRS MMI SRVC USE_STR2IND exec scripts/mk-component.sh "$@"