# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1474994816 0
# Node ID 6323e661f2edf5826dabf79ecfd0750ae196e5c7
# Parent  c15047b3d00d742b82399c26617dc357eb0aa096
added the ability to select different gpf and cdginc versions

diff -r c15047b3d00d -r 6323e661f2ed components/aci-classic
--- a/components/aci-classic	Tue Sep 27 16:27:34 2016 +0000
+++ b/components/aci-classic	Tue Sep 27 16:46:56 2016 +0000
@@ -66,9 +66,9 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 
 if [ "$MMI" = 2 ]
 then
@@ -80,7 +80,7 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci_ext"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/prim"
+CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -453,12 +453,12 @@
 # New includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/prim"
+CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
 
 # KSD source modules
 
@@ -522,12 +522,12 @@
 # New includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ati_ext"
-CPPFLAGS="$CPPFLAGS -I../../cdg211/prim"
+CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
 
 # ati_ext source modules
 
diff -r c15047b3d00d -r 6323e661f2ed scripts/mkcomp-test.sh
--- a/scripts/mkcomp-test.sh	Tue Sep 27 16:27:34 2016 +0000
+++ b/scripts/mkcomp-test.sh	Tue Sep 27 16:46:56 2016 +0000
@@ -1,11 +1,39 @@
 #!/bin/sh
 
-BUILD_DIR=build-sb
+if [ -z "$BUILD_DIR" ]
+then
+	BUILD_DIR=build-sb
+fi
+
+if [ -z "$USE_STR2IND" ]
+then
+	USE_STR2IND=0
+fi
+
+if [ -z "$GPF" ]
+then
+	GPF=gpf2
+fi
+
+case "$GPF" in
+	gpf2)
+		CDGINC=cdg211/cdginc
+		CDGPRIM=cdg211/prim
+		;;
+	gpf3)
+		CDGINC=cdg3/cdginc-conservative
+		CDGPRIM=cdg3/sap-inline
+		;;
+	*)
+		echo "Error: bad GPF= setting" 1>&2
+		exit 1
+		;;
+esac
+
 GPRS=1
 MMI=0
 SRVC=1
-USE_STR2IND=0
 
-export BUILD_DIR GPRS MMI SRVC USE_STR2IND
+export BUILD_DIR CDGINC CDGPRIM GPF GPRS MMI SRVC USE_STR2IND
 
 exec scripts/mk-component.sh "$@"
diff -r c15047b3d00d -r 6323e661f2ed scripts/str2ind-test.sh
--- a/scripts/str2ind-test.sh	Tue Sep 27 16:27:34 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-BUILD_DIR=build-sb
-GPRS=1
-MMI=0
-SRVC=1
-USE_STR2IND=1
-
-export BUILD_DIR GPRS MMI SRVC USE_STR2IND
-
-exec scripts/mk-component.sh "$@"