diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-31 14:41:47 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-31 14:41:47 (GMT) |
| commit | 40ad09637974f840ea4bdd3b7b27e2f5d7388c5b (patch) | |
| tree | 46b27584d5eb01d52d9d1601af5354280af4d852 /scripts | |
| parent | 5d3ae2a77e97223984b74f312460d9d2f60edbe6 (diff) | |
| parent | 31b234140dba2e919113a521c1b3c2131eea075c (diff) | |
Merge branch 'master' into issue181
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/builder.sh | 26 | ||||
| -rwxr-xr-x | scripts/check-dependencies.sh | 11 | ||||
| -rwxr-xr-x | scripts/publish-macosx.sh | 6 |
3 files changed, 25 insertions, 18 deletions
diff --git a/scripts/builder.sh b/scripts/builder.sh index 6a143e3..71023da 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -176,19 +176,19 @@ update_win_www_download_links() DATECODE=`date +"%Y.%m.%d"` rm win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js - - echo "snapinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js + + echo "fileinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js echo 'modified win_snapshot_links.js' PAGER=cat git diff diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index ef8c904..4d5505e 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -155,8 +155,15 @@ flex_sysver() bison_sysver() { + # bison (GNU Bison) 2.7.12-4996 if [ ! -x $1/bin/bison ]; then return ; fi - bison_sysver_result=`$1/bin/bison --version | grep bison | sed s/"[^0-9.]"/" "/g` + bison_sver=`$1/bin/bison --version | grep bison` + debug bison_sver1: $bison_sver + bison_sver=`echo $bison_sver | awk -F ")" ' { print $2 } '` + debug bison_sver2: $bison_sver + bison_sver=`echo $bison_sver | awk -F "-" ' { print $1 } '` + debug bison_sver3: $bison_sver + bison_sysver_result=$bison_sver } gcc_sysver() @@ -425,7 +432,7 @@ find_installed_version() debug $depname"_sysver" $syspath eval $depname"_sysver" $syspath fsv_tmp=`eval echo "$"$depname"_sysver_result"` - if [ $fsv_tmp ]; then break; fi + if [ $fsv_tmp ]; then break; fi fi done fi diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index a3b0090..ed72163 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -26,9 +26,9 @@ update_www_download_links() if [ -f $webdir/$incfile ]; then cd $webdir - echo "snapinfo['MAC_SNAPSHOT_URL'] = '$BASEURL$packagefile'" > $incfile - echo "snapinfo['MAC_SNAPSHOT_NAME'] = 'OpenSCAD $version'" >> $incfile - echo "snapinfo['MAC_SNAPSHOT_SIZE'] = '$filesize'" >> $incfile + echo "fileinfo['MAC_SNAPSHOT_URL'] = '$BASEURL$packagefile'" > $incfile + echo "fileinfo['MAC_SNAPSHOT_NAME'] = 'OpenSCAD $version'" >> $incfile + echo "fileinfo['MAC_SNAPSHOT_SIZE'] = '$filesize'" >> $incfile echo 'modified mac_snapshot_links.js' git --no-pager diff |