--- elwix/build_tools.sh	2012/03/20 15:54:00	1.1.2.6
+++ elwix/build_tools.sh	2013/05/14 09:32:42	1.5.4.1
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# ELWIX build script for cross
+# ELWIX build script for tools
 #
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.1.2.6 2012/03/20 15:54:00 misho Exp $
+# $Id: build_tools.sh,v 1.5.4.1 2013/05/14 09:32:42 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,28 +48,62 @@ 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
 
 	install -d ${PKGDIR}
 	install -d ${PKGDIR}/db
+	install -d ${PKGDIR}/etc
 }
 
+compile_deps()
+{
+	echo "+++ Compile ELWIX programs bootstrap tools ..."
+	cd tools
+	make obj
+	make depend
+	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
 		echo " Skip bootstrap pkgsrc - already inited pkgsrc"
 	fi
 
+	cat >>/elwix/pkg/etc/mk.conf << _EOF
+
+.if defined(USE_CROSS_COMPILE) && !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+USE_DESTDIR=		yes
+DEPENDS_TARGET=		package-install
+
+TOOLDIR=                ${CROSSTOOLDIR}
+CROSS_DESTDIR=		${WORLD}
+
+TARGET=			${TARGET}
+TARGET_ARCH=		${TARGET_ARCH}
+MACHINE_PLATFORM=	FreeBSD-${PLATFORM}-${TARGET_ARCH}
+MACHINE_GNU_PLATFORM=	${TARGET_ARCH}-elwix-freebsd
+
+PKGSRC_COMPILER=	gcc
+USE_PKGSRC_GCC=		no
+USE_NATIVE_GCC=		yes
+
+.endif			# end cross-compilation settings
+_EOF
+
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
 }
 
@@ -82,7 +111,7 @@ compile_fbsdtools()
 {
 	echo "+++ Compile ELWIX FreeBSD tools ..."
 
-	cd $CROSS_FT_ATH
+	cd $CROSS_FT_VIMAGE
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
@@ -91,16 +120,16 @@ compile_fbsdtools()
 		install DESTDIR=${WORLD}
 	cd -
 
-	cd $CROSS_FT_IPW
+	cd $CROSS_FT_ATH
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}/usr/local/bin
+		install DESTDIR=${WORLD}
 	cd -
 
-	cd $CROSS_FT_IWI
+	cd $CROSS_FT_IPW
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
@@ -109,16 +138,16 @@ compile_fbsdtools()
 		install DESTDIR=${WORLD}/usr/local/bin
 	cd -
 
-	cd $CROSS_FT_MWL
+	cd $CROSS_FT_IWI
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		install DESTDIR=${WORLD}
+		install DESTDIR=${WORLD}/usr/local/bin
 	cd -
 
-	cd $CROSS_FT_NET80211
+	cd $CROSS_FT_MWL
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
@@ -127,7 +156,7 @@ compile_fbsdtools()
 		install DESTDIR=${WORLD}
 	cd -
 
-	cd $CROSS_FT_VIMAGE
+	cd $CROSS_FT_NET80211
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		clean DESTDIR=${WORLD}
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
@@ -146,12 +175,35 @@ compile_fbsdtools()
 #	cd -
 }
 
+compile_files()
+{
+	cd files
+	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
+		TARGET_ARCH=${TARGET_ARCH} clean DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
+		TARGET_ARCH=${TARGET_ARCH} obj depend DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
+		TARGET_ARCH=${TARGET_ARCH} DESTDIR=${WORLD}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \
+		TARGET_ARCH=${TARGET_ARCH} install DESTDIR=${WORLD}
+	cd -
+
+	strip -s ${WORLD}/usr/bin/csh
+}
+
 compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
 
-	cd $CROSS_AXL
-	${AXL_CFG}
+#	cd $CROSS_AXL
+#	${AXL_CFG}
+#	${CBUILD} clean
+#	${CBUILD}
+#	${CBUILD} install
+#	cd -
+
+	cd $CROSS_ELWIX
+	${ELWIX_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -164,13 +216,6 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITCRC
-	${AITCRC_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
-
 	cd $CROSS_AITCFG
 	${AITCFG_CFG}
 	${CBUILD} clean
@@ -178,8 +223,8 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITSESS
-	${AITSESS_CFG}
+	cd $CROSS_AITSCHED
+	${AITSCHED_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -192,13 +237,6 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITSCHED
-	${AITSCHED_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
-
 	cd $CROSS_AITWWW
 	${AITWWW_CFG}
 	${CBUILD} clean
@@ -213,13 +251,6 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITPWD
-	${AITPWD_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
-
 	cd $CROSS_AITSYNC
 	${AITSYNC_CFG}
 	${CBUILD} clean
@@ -255,20 +286,35 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
+	cd $CROSS_MQTT
+	${MQTT_CFG}
+	${CBUILD} clean
+	${CBUILD}
+	${CBUILD} install
+	cd -
+
+#	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
 	compile_fbsdtools
+	compile_files
 	compile_tools
 else
 	echo "Skipped ELWIX tools build ..."