--- elwix/build_tools.sh	2012/02/17 13:41:19	1.1.2.1
+++ elwix/build_tools.sh	2012/03/20 15:10:06	1.1.2.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.1.2.1 2012/02/17 13:41:19 misho Exp $
+# $Id: build_tools.sh,v 1.1.2.4 2012/03/20 15:10:06 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -15,6 +15,7 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	exit 1
 fi
+[ -r ${CENV} ] && . ${CENV}
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -44,6 +45,35 @@ clean_tools()
 
 }
 
+clean_bootstrap()
+{
+	echo "+++ Clean ELWIX pkgsrc bootstrap tools ..."
+
+	rm -rf ${WORLD}/usr/pkgsrc/bootstrap/work
+	rm -f /elwix ${WORLD}/usr/pkgsrc
+	rm -rf ${WORLD}/elwix
+	install -d ${WORLD}/elwix
+	ln -sf ${WORLD}/elwix /elwix
+	ln -sf ${PKGSRC} ${WORLD}/usr/pkgsrc
+
+	install -d ${PKGDIR}
+	install -d ${PKGDIR}/db
+}
+
+compile_bootstrap()
+{
+	echo "+++ Compile ELWIX pkgsrc bootstrap tools ..."
+	if [ ! -d ${WORLD}/usr/pkgsrc/bootstrap/work ]; then
+		cd ${WORLD}/usr/pkgsrc/bootstrap
+		./bootstrap --prefix /elwix/pkg --pkgdbdir /elwix/pkg/db
+		cd -
+	else
+		echo " Skip bootstrap pkgsrc - already inited pkgsrc"
+	fi
+
+	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
+}
+
 compile_fbsdtools()
 {
 	echo "+++ Compile ELWIX FreeBSD tools ..."
@@ -115,6 +145,9 @@ compile_fbsdtools()
 compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
+
+	unset INSTALL
+
 	cd $CROSS_AXL
 	${AXL_CFG}
 	${CBUILD} clean
@@ -164,6 +197,13 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
+	cd $CROSS_AITWWW
+	${AITWWW_CFG}
+	${CBUILD} clean
+	${CBUILD}
+	${CBUILD} install
+	cd -
+
 	cd $CROSS_AITPELCO
 	${AITPELCO_CFG}
 	${CBUILD} clean
@@ -217,7 +257,14 @@ compile_tools()
 }
 
 ### main()
-if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
+if SnitVer ${WORLD}/elwix/elwix.ver; then
+	clean_bootstrap
+	compile_bootstrap
+else
+	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
+fi
+
+if SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools
 	compile_fbsdtools
 	compile_tools