--- elwix/build_tools.sh	2012/03/10 15:42:28	1.1.2.3
+++ elwix/build_tools.sh	2012/10/11 12:39:25	1.1.2.13
@@ -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.3 2012/03/10 15:42:28 misho Exp $
+# $Id: build_tools.sh,v 1.1.2.13 2012/10/11 12:39:25 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -15,6 +15,11 @@ 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
@@ -44,6 +49,57 @@ 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
+	install -d ${PKGDIR}/etc
+}
+
+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
+
+	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
+}
+
 compile_fbsdtools()
 {
 	echo "+++ Compile ELWIX FreeBSD tools ..."
@@ -112,6 +168,22 @@ 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 ..."
@@ -123,15 +195,15 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITIO
-	${AITIO_CFG}
+	cd $CROSS_AITCRC
+	${AITCRC_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITCRC
-	${AITCRC_CFG}
+	cd $CROSS_AITIO
+	${AITIO_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -179,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
@@ -221,13 +286,28 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
+	cd $CROSS_MQTT
+	${ANSH_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
+else
+	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
+fi
+
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
 	clean_tools
 	compile_fbsdtools
+	compile_files
 	compile_tools
 else
 	echo "Skipped ELWIX tools build ..."