--- elwix/build_tools.sh	2013/05/07 20:46:47	1.5
+++ elwix/build_tools.sh	2013/05/15 16:13:37	1.5.4.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.5 2013/05/07 20:46:47 misho Exp $
+# $Id: build_tools.sh,v 1.5.4.2 2013/05/15 16:13:37 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -15,11 +15,6 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	echo
 	exit 1
 fi
-V=${VERSION}
-[ -r ${CENV} ] && . ${CENV}
-unset INSTALL
-unset VERSION
-VERSION="$V"
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -53,9 +48,9 @@ clean_bootstrap()
 {
 	echo "+++ Clean ELWIX pkgsrc bootstrap tools ..."
 
-	rm -rf ${WORLD}/usr/pkgsrc/bootstrap/work
+	rm -Rf ${WORLD}/usr/pkgsrc/bootstrap/work
 	rm -f /elwix ${WORLD}/usr/pkgsrc
-	rm -rf ${WORLD}/elwix
+	rm -Rf ${WORLD}/elwix
 	install -d ${WORLD}/elwix
 	ln -sf ${WORLD}/elwix /elwix
 	ln -sf ${PKGSRC} ${WORLD}/usr/pkgsrc
@@ -65,11 +60,24 @@ clean_bootstrap()
 	install -d ${PKGDIR}/etc
 }
 
+compile_deps()
+{
+	echo "+++ Compile ELWIX programs bootstrap tools ..."
+	cd tools
+	make cleandepend
+	make clean
+	make obj
+	make
+	make install
+	cd -
+}
+
 compile_bootstrap()
 {
 	echo "+++ Compile ELWIX pkgsrc bootstrap tools ..."
 	if [ ! -d ${WORLD}/usr/pkgsrc/bootstrap/work ]; then
 		cd ${WORLD}/usr/pkgsrc/bootstrap
+		./cleanup --prefix /elwix/pkg --pkgdbdir /elwix/pkg/db 
 		./bootstrap --prefix /elwix/pkg --pkgdbdir /elwix/pkg/db
 		cd -
 	else
@@ -188,12 +196,12 @@ compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
 
-	cd $CROSS_AXL
-	${AXL_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
+#	cd $CROSS_AXL
+#	${AXL_CFG}
+#	${CBUILD} clean
+#	${CBUILD}
+#	${CBUILD} install
+#	cd -
 
 	cd $CROSS_ELWIX
 	${ELWIX_CFG}
@@ -216,15 +224,15 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITRPC
-	${AITRPC_CFG}
+	cd $CROSS_AITSCHED
+	${AITSCHED_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITSCHED
-	${AITSCHED_CFG}
+	cd $CROSS_AITRPC
+	${AITRPC_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -286,16 +294,23 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
+#	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 }
 
 ### main()
 if ! SnitVer ${WORLD}/elwix/elwix.ver; then
-	clean_bootstrap
-	compile_bootstrap
+	compile_deps || exit 1
+#	clean_bootstrap
+#	compile_bootstrap || exit 1
 else
 	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
 fi
+
+V=${VERSION}
+[ -r ${CENV} ] && . ${CENV}
+unset INSTALL
+unset VERSION
+VERSION="$V"
 
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools