From b3b83059e7c62339712e71294662cd3fa883f0db Mon Sep 17 00:00:00 2001 From: Don Bright Date: Fri, 17 May 2013 15:32:23 -0500 Subject: [PATCH] tweaks to improve build. alos update about.html docs --- scripts/builder.sh | 43 ++++++++++++++++++--------- scripts/mingw-x-build-dependencies.sh | 14 ++++----- scripts/release-common.sh | 4 ++- src/AboutDialog.html | 4 ++- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/scripts/builder.sh b/scripts/builder.sh index e8876e86..7cd551e9 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -12,11 +12,16 @@ # # todo - detect failure and stop -DRYRUN= +DRYRUN=1 + +init_variables() +{ + STARTPATH=$PWD + export STARTPATH +} check_starting_path() { - STARTPATH=$PWD if [ -e openscad.pro ]; then echo 'please start from a clean directory outside of openscad' exit @@ -36,6 +41,8 @@ build_win32() . ./scripts/setenv-mingw-xbuild.sh ./scripts/mingw-x-build-dependencies.sh ./scripts/release-common.sh mingw32 + DATECODE=`date +"%Y.%m.%d"` + export DATECODE } build_win64() @@ -44,6 +51,8 @@ build_win64() . ./scripts/setenv-mingw-xbuild.sh 64 ./scripts/mingw-x-build-dependencies.sh 64 ./scripts/release-common.sh mingw64 + DATECODE=`date +"%Y.%m.%d"` + export DATECODE } build_lin32() @@ -51,24 +60,29 @@ build_lin32() . ./scripts/setenv-unibuild.sh ./scripts/uni-build-dependencies.sh ./scripts/release-common.sh + DATECODE=`date +"%Y.%m.%d"` + export DATECODE } upload_win_generic() { - # 1=file summary, 2 = username, 3 = filename - if [ -e $3 ]; then - echo $3 found + summary="$1" + username=$2 + filename=$3 + if [ -f $filename ]; then + echo 'file "'$filename'" found' else - echo $3 not found + echo 'file "'$filename'" not found' fi opts= opts="$opts -p openscad" - opts="$opts -u $2" - opts="$opts $3" - if [ ! $DRYRUN ]; then - python ./scripts/googlecode_upload.py -s "$1" $opts - else + opts="$opts -u $username" + opts="$opts $filename" + if [ $DRYRUN ]; then echo dry run, not uploading to googlecode + echo cmd - python ./scripts/googlecode_upload.py -s '"'$summary'"' $opts + else + python ./scripts/googlecode_upload.py -s "$summary" $opts fi } @@ -76,7 +90,6 @@ upload_win32() { SUMMARY1="Windows x86-32 Snapshot Zipfile" SUMMARY2="Windows x86-32 Snapshot Installer" - DATECODE=`date +"%Y.%m.%d"` BASEDIR=./mingw32/ WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32.zip WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32-Installer.exe @@ -96,7 +109,6 @@ upload_win64() { SUMMARY1="Windows x86-64 Snapshot Zipfile" SUMMARY2="Windows x86-64 Snapshot Installer" - DATECODE=`date +"%Y.%m.%d"` BASEDIR=./mingw64/ WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64.zip WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64-Installer.exe @@ -114,6 +126,7 @@ upload_win64() read_username_from_user() { + if [ $DRYRUN ]; then USERNAME=none;export USERNAME; return; fi echo 'Please enter your username for https://code.google.com/hosting/settings' echo -n 'Username:' read USERNAME @@ -122,6 +135,7 @@ read_username_from_user() read_password_from_user() { + if [ $DRYRUN ]; then return; fi echo 'Please enter your password for https://code.google.com/hosting/settings' echo -n 'Password:' read -s PASSWORD1 @@ -145,7 +159,6 @@ update_win_www_download_links() cd inc echo `pwd` BASEURL='https://openscad.google.com/files/' - DATECODE=`date +"%Y.%m.%d"` rm win_snapshot_links.js echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js @@ -174,6 +187,7 @@ update_win_www_download_links() check_ssh_agent() { + if [ $DRYRUN ]; then echo 'skipping ssh, dry run'; return; fi if [ ! $SSH_AUTH_SOCK ]; then echo 'please start an ssh-agent for github.com/openscad/openscad.github.com uploads' echo 'for example:' @@ -183,6 +197,7 @@ check_ssh_agent() fi } +init_variables check_ssh_agent check_starting_path read_username_from_user diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 168b8473..c3d51791 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -46,13 +46,13 @@ fi if [ ! -e $MXEDIR ]; then mkdir -p $MXEDIR - cd $MXEDIR/.. - echo "Downloading MXE into " $PWD - if [ "`echo $* | grep 64`" ]; then - git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64 - else - git clone git://github.com/mxe/mxe.git - fi +fi +cd $MXEDIR/.. +echo "Downloading MXE into " $PWD +if [ "`echo $* | grep 64`" ]; then + git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64 +else + git clone git://github.com/mxe/mxe.git fi echo "entering" $MXEDIR diff --git a/scripts/release-common.sh b/scripts/release-common.sh index 85b719ce..a9fb3b53 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -48,17 +48,19 @@ elif [[ $OSTYPE == "linux-gnu" ]]; then else ARCH=32 fi - echo "Detected ARCH: $ARCH" + echo "Detected build-machine ARCH: $ARCH" fi if [ "`echo $* | grep mingw32`" ]; then OS=LINXWIN ARCH=32 + echo Mingw-cross build using ARCH=32 fi if [ "`echo $* | grep mingw64`" ]; then OS=LINXWIN ARCH=64 + echo Mingw-cross build using ARCH=64 fi if [ $OS ]; then diff --git a/src/AboutDialog.html b/src/AboutDialog.html index 6203e83d..946f5e73 100644 --- a/src/AboutDialog.html +++ b/src/AboutDialog.html @@ -67,7 +67,7 @@ Please visit this link for a copy of the license: Marius Kintel

@@ -101,6 +101,8 @@ Please visit this link for a copy of the license: iamwilhelm

  • clothbot
  • colah +
  • Peter Uithoven +