# HG changeset patch # User Jan Vrany # Date 1509632649 0 # Node ID 9d1750614ee99eb31316bcb43636417dca419b23 # Parent b0874b09676a1a9b9e0ab240aaadd2b7e416b290 Cleanup: removed (now obsolete) hack for `stx:libtool` that dealt with wrong filenames in other package build files. Even eXept moved on and renamed files! diff -r b0874b09676a -r 9d1750614ee9 specs/stx-jv.rbspec --- a/specs/stx-jv.rbspec Thu Nov 02 11:53:51 2017 +0000 +++ b/specs/stx-jv.rbspec Thu Nov 02 14:24:09 2017 +0000 @@ -127,49 +127,9 @@ if PROJECT == 'stx:jv-branch' then chdir BUILD_DIR / 'stx' / 'projects' / 'smalltalk' do if win32? - cmd = "smalltalk.bat --abortOnSEGV -I --quick --eval \"Stdout nextPutLine:'OKay, VM runs'. Smalltalk exit: 0\"" + sh "smalltalk.bat --abortOnSEGV -I --quick --eval \"Stdout nextPutLine:'OKay, VM runs'. Smalltalk exit: 0\"" else - cmd = "./smalltalk --abortOnSEGV -I --quick --eval \"Stdout nextPutLine:'OKay, VM runs'. Smalltalk exit: 0\"" - end - if not system cmd - raise Exception.new("Cannot run smalltalk!") - end - end - end - end - - if win32_wine? - task :'stx:projects/smalltalk:pre' do - chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do - make "buildDate.h" - end - end - - end - - # Hack for badly-named files in libtool - task :'stx:libtool:post' do - chdir (BUILD_DIR / 'stx' / 'libtool') do - # Windows does not support symlinks, copy the file - if win32? - if not File.exist? 'Tools_BrowserList.STH' - cp 'Tools__BrowserList.STH', 'Tools_BrowserList.STH' - end - if not File.exist? 'Tools_NavigatorModel.STH' - cp 'Tools__NavigatorModel.STH', 'Tools_NavigatorModel.STH' - end - if not File.exist? 'Tools_NavigationState.STH' - cp 'Tools__NavigationState.STH', 'Tools_NavigationState.STH' - end - else - if not File.exist? 'Tools_BrowserList.H' - ln_s 'Tools__BrowserList.H', 'Tools_BrowserList.H' - end - if not File.exist? 'Tools_NavigatorModel.H' - ln_s 'Tools__NavigatorModel.H', 'Tools_NavigatorModel.H' - end - if not File.exist? 'Tools_NavigationState.H' - ln_s 'Tools__NavigationState.H', 'Tools_NavigationState.H' + sh "./smalltalk --abortOnSEGV -I --quick --eval \"Stdout nextPutLine:'OKay, VM runs'. Smalltalk exit: 0\"" end end end