Skip to content

Commit

Permalink
Adapting to new Run2 procedure
Browse files Browse the repository at this point in the history
  • Loading branch information
efrecon committed May 4, 2015
1 parent 2ba7784 commit f697740
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion RELEASENOTES.md
@@ -1,6 +1,6 @@
# Release Notes

## v 0.5 (in development)
## v 0.5

* The default is now to use the locally cached images when
initialising virtual machines. This will speed up initialisation in
Expand Down
Empty file modified make/bin/linux-ix86/tclkit 100644 → 100755
Empty file.
4 changes: 4 additions & 0 deletions make/distro/README.md
@@ -0,0 +1,4 @@
# Target Location

This is the target directory where distribution binaries will
automatically be created.
12 changes: 6 additions & 6 deletions make/make.tcl
Expand Up @@ -16,13 +16,13 @@ if { [llength $argv] == 0 } {
}

cluster log NOTICE "Getting version"
set version [lindex [::cluster::Run -return -- ../machinery version] 0]
set version [lindex [::cluster::Run2 -return -- ../machinery version] 0]

cluster log NOTICE "Creating skeleton and filling VFS"
set tclkit [file join $bindir [::platform::generic] tclkit]
set sdx [file join $kitdir sdx.kit]
::cluster::Run $tclkit $sdx qwrap ../machinery
::cluster::Run $tclkit $sdx unwrap machinery.kit
::cluster::Run2 $tclkit $sdx qwrap ../machinery
::cluster::Run2 $tclkit $sdx unwrap machinery.kit
foreach fname [glob -directory [file join $dirname .. lib] -nocomplain -- *] {
file copy -force -- $fname machinery.vfs/lib
}
Expand All @@ -31,11 +31,11 @@ foreach platform $argv {
set binkit [file join $bindir $platform tclkit]
if { [file exists $binkit] } {
cluster log INFO "Final wrapping of binary for $platform"
::cluster::Run $tclkit $sdx wrap machinery.kit
::cluster::Run2 $tclkit $sdx wrap machinery.kit
# Copy runtime to temporary because won't work if same as the
# one we are starting from.
file copy $binkit ${binkit}.temp
::cluster::Run $tclkit $sdx wrap machinery -runtime ${binkit}.temp
::cluster::Run2 $tclkit $sdx wrap machinery -runtime ${binkit}.temp
file delete ${binkit}.temp
} else {
cluster log ERROR "Cannot build for $platform, no main kit available"
Expand All @@ -44,4 +44,4 @@ foreach platform $argv {
[file join $dstdir machinery-$version-$platform]
}
file delete -force -- machinery.vfs
file delete -force -- machinery.kit
file delete -force -- machinery.kit

0 comments on commit f697740

Please sign in to comment.