Merge branch 'pulltestwin32'

This commit is contained in:
Gavin Andresen 2013-10-08 10:50:27 +10:00
commit adae2f1819

View File

@ -17,11 +17,21 @@ fi
DISTDIR=@PACKAGE@-@VERSION@ DISTDIR=@PACKAGE@-@VERSION@
# Test win32 build first (it breaks the most often)
cd @abs_top_srcdir@
make distdir
mv $DISTDIR win32-build
cd win32-build
./configure --disable-silent-rules --disable-ccache --prefix=$MINGWPREFIX --host=i586-mingw32msvc --with-qt-bindir=$MINGWPREFIX/host/bin --with-qt-plugindir=$MINGWPREFIX/plugins --with-qt-incdir=$MINGWPREFIX/include --with-boost=$MINGWPREFIX --with-protoc-bindir=$MINGWPREFIX/host/bin CPPFLAGS=-I$MINGWPREFIX/include LDFLAGS=-L$MINGWPREFIX/lib
make -j$JOBS
make check
# ... then linux build, with blockchain-tester:
cd @abs_top_srcdir@ cd @abs_top_srcdir@
make distdir make distdir
mv $DISTDIR linux-build mv $DISTDIR linux-build
cd linux-build cd linux-build
./configure --with-comparison-tool="$JAVA_COMPARISON_TOOL" ./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL"
make -j$JOBS make -j$JOBS
make check make check
@ -34,12 +44,3 @@ cd linux-coverage-build
make -j$JOBS make -j$JOBS
make cov make cov
# win32 build disabled until pull-tester has updated dependencies
##Test win32 build
#cd @abs_top_srcdir@
#make distdir
#mv $DISTDIR win32-build
#cd win32-build
#./configure --prefix=$MINGWPREFIX --host=i586-mingw32msvc --with-qt-bindir=$MINGWPREFIX/host/bin --with-qt-plugindir=$MINGWPREFIX/plugins --with-qt-incdir=$MINGWPREFIX/include --with-boost=$MINGWPREFIX --with-protoc-bindir=$MINGWPREFIX/host/bin --with-comparison-tool="$JAVA_COMPARISON_TOOL" CPPFLAGS=-I$MINGWPREFIX/include LDFLAGS=-L$MINGWPREFIX/lib
#make -j$JOBS
#make check