Make more suitable guess of actual version string
so unless Smalltalk/X versin (as defined in Smalltalk class) changes,
the initial version would be same as the one computed by task
:'stx:jv-branch:extractver'.
Made Cairo dll-copying tasks (referenced from 'dist:jv:post') dependent
on :'stx:jv-branch:extractver' so .dll are copied to correct directory.
--- a/specs/stx-jv.rbspec Thu May 26 10:21:20 2016 +0100
+++ b/specs/stx-jv.rbspec Thu May 26 21:22:56 2016 +0100
@@ -234,7 +234,7 @@
app_name "smalltalkx-jv-branch"
- app_version "6.2.5.0_0"
+ app_version "6.2.5_#{BUILD_ID}"
# Forked PetitParser
package "stx:goodies/petitparser", :repository => :'bitbucket:janvrany', :link => false
@@ -354,10 +354,9 @@
install_dir = ARTIFACTS_DIR / BUILD_NAME
bin_dir = install_dir / 'bin'
- cairo_dll_dir = nil
+
cairo_dlls = nil
if ARCH == 'i386'
- cairo_dll_dir = BUILD_DIR / 'stx' / 'goodies' / 'libcairo' / 'support' / 'win32' / 'i586'
cairo_dlls = [
'libcairo-2.dll' ,
'libfontconfig-1.dll' ,
@@ -369,7 +368,6 @@
'zlib1.dll'
]
else
- cairo_dll_dir = BUILD_DIR / 'stx' / 'goodies' / 'libcairo' / 'support' / 'win32' / 'x86_64'
cairo_dlls = [
'fontconfig.dll' ,
'iconv.dll' ,
@@ -381,12 +379,12 @@
]
end
- task :'dist:jv:post' => :'dist:jv:variables'
+ task :'dist:jv:post' => [ :'stx:jv-branch:extractver' , :'dist:jv:variables' ]
cairo_dlls.each do | dll |
- task :'dist:jv:post' => bin_dir / dll
+ task :'dist:jv:post' => [ bin_dir / dll ]
file bin_dir / dll do
mkdir_p bin_dir
- cp cairo_dll_dir / dll , bin_dir / dll
+ cp BUILD_DIR / 'stx' / 'goodies' / 'libcairo' / 'support' / 'win32' / ARCH / dll , bin_dir / dll
end
end
end