jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates to MXE/win cross-build. use mingw64.static build dir.

Browse source 
check for 'zip' command when building package. auto detect mxe in /opt/mxe
This commit is contained in:
Don 2015-11-01 17:41:09 -05:00 committed by Marius Kintel
parent a3af70309c
commit cc92ba5a80
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/builder.sh
View file

@ -120,6 +120,17 @@ check_nsis()
fi fi
} }
check_zip()
if [ ! "`command -v zip`" ]; then
echo the zip command was not found. please install zip
echo on debian, sudo apt-get install zip
exit 1
else
echo zip found.
fi
}
get_openscad_source_code() get_openscad_source_code()
{ {
if [ -d openscad ]; then if [ -d openscad ]; then
@ -251,7 +262,7 @@ upload_win32()
SUMMARY1="Windows x86-32 Snapshot Installer" SUMMARY1="Windows x86-32 Snapshot Installer"
SUMMARY2="Windows x86-32 Snapshot Zipfile" SUMMARY2="Windows x86-32 Snapshot Zipfile"
SUMMARY3="Windows x86-32 Snapshot Tests" SUMMARY3="Windows x86-32 Snapshot Tests"
BASEDIR=./mingw32/ BASEDIR=./mingw32.static/
WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe
WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip
WIN32_PACKAGEFILE3=OpenSCAD-Tests-$DATECODE-x86-32.zip WIN32_PACKAGEFILE3=OpenSCAD-Tests-$DATECODE-x86-32.zip
@ -277,7 +288,7 @@ upload_win64()
SUMMARY1="Windows x86-64 Snapshot Zipfile" SUMMARY1="Windows x86-64 Snapshot Zipfile"
SUMMARY2="Windows x86-64 Snapshot Installer" SUMMARY2="Windows x86-64 Snapshot Installer"
SUMMARY3="Windows x86-64 Snapshot Tests" SUMMARY3="Windows x86-64 Snapshot Tests"
BASEDIR=./mingw64/ BASEDIR=./mingw64.static/
WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe
WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip
WIN64_PACKAGEFILE3=OpenSCAD-Tests-$DATECODE-x86-64.zip WIN64_PACKAGEFILE3=OpenSCAD-Tests-$DATECODE-x86-64.zip
@ -409,6 +420,7 @@ main()
fi fi
check_starting_path check_starting_path
check_nsis check_nsis
check_zip
read_username_from_user read_username_from_user
read_password_from_user read_password_from_user
get_openscad_source_code get_openscad_source_code

2
scripts/release-common.sh
View file

@ -528,7 +528,7 @@ if [ $BUILD_TESTS ]; then
# while copying. # while copying.
rm -f ./ostests.tar rm -f ./ostests.tar
for subdir in tests testdata libraries examples doc; do for subdir in tests testdata libraries examples doc; do
tar prvf ./ostests.tar --exclude=.git* --exclude=*/mingw64/* --exclude=*/mingw32/* --exclude=*.cc.obj --exclude=*.a $subdir tar prvf ./ostests.tar --exclude=.git* --exclude=*/mingw* --exclude=*.cc.obj --exclude=*.a $subdir
done done
cd $DEPLOYDIR cd $DEPLOYDIR
tar prvf $OPENSCADDIR/ostests.tar --exclude=.git* --exclude=*/mingw* --exclude=*.cc.obj --exclude=*.a $TESTBINDIR tar prvf $OPENSCADDIR/ostests.tar --exclude=.git* --exclude=*/mingw* --exclude=*.cc.obj --exclude=*.a $TESTBINDIR

9
scripts/setenv-mingw-xbuild.sh
View file

@ -22,8 +22,8 @@ if [ ! $BASEDIR ]; then
BASEDIR=$HOME/openscad_deps BASEDIR=$HOME/openscad_deps
fi fi
DEPLOYDIR64=$OPENSCADDIR/mingw64 DEPLOYDIR64=$OPENSCADDIR/mingw64.static
DEPLOYDIR32=$OPENSCADDIR/mingw32 DEPLOYDIR32=$OPENSCADDIR/mingw32.static
if [ ! $DEPLOYDIR ]; then if [ ! $DEPLOYDIR ]; then
if [ "`echo $* | grep 64 `" ]; then if [ "`echo $* | grep 64 `" ]; then
@ -39,6 +39,11 @@ if [ ! $MXEDIR ]; then
else else
MXEDIR=$BASEDIR/mxe MXEDIR=$BASEDIR/mxe
fi fi
if [ ! -e $MXEDIR ]; then
if [ -e /opt/mxe ]; then
MXEDIR=/opt/mxe
fi
fi
fi fi
if [ ! $MXEQTSUBDIR ]; then if [ ! $MXEQTSUBDIR ]; then