Permalink
Browse files

Change "make prebuilt" so that it uses local VirtualBox VMs.

  • Loading branch information...
1 parent 15c7390 commit aba6a4d1fdae9333e09369508ca9b447ccf93004 @feeley feeley committed Feb 13, 2012
Showing with 23 additions and 16 deletions.
  1. +2 −2 include/stamp.h
  2. +7 −2 makefile.in
  3. +2 −2 prebuilt/macosx/build-phase2.in
  4. +10 −8 prebuilt/remote-connect
  5. +2 −2 prebuilt/windows/build-phase2.in
View
4 include/stamp.h
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20120210
-#define ___STAMP_HMS 52234
+#define ___STAMP_YMD 20120213
+#define ___STAMP_HMS 192149
View
9 makefile.in
@@ -1,6 +1,6 @@
# makefile for Gambit-C system.
-# Copyright (c) 1994-2011 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
PACKAGE_SHORTNAME = @PACKAGE_SHORTNAME@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -86,6 +86,11 @@ DISTFILES = $(RCFILES) $(GENDISTFILES)
GITDISTFILES = $(GITRCFILES)
HGDISTFILES = $(HGRCFILES)
+#BUILD_FARM = farm
+BUILD_FARM = localhost
+#BUILD_HOST = baro.iro.umontreal.ca
+BUILD_HOST = localhost
+
.SUFFIXES:
all:
@@ -110,7 +115,7 @@ examples: fake_target all
cd examples && $(MAKE) $(MDEFINES) $@
prebuilt: dist dist-devel
- PATH="gsi:$$PATH" prebuilt/remote-connect farm "" "(define tmpdir \"gambtmp0\")(define gambc-dist \"$(PACKAGE_TARNAME)\")(define timeout 600)(ssh timeout (string-append \"rm -rf \" tmpdir \";mkdir \" tmpdir \";echo 'logged in on:';hostname\"))(scp-to timeout (string-append gambc-dist \".tgz\") (string-append tmpdir \"/.\"))(ssh timeout (string-append \"ssh baro.iro.umontreal.ca 'cd \" tmpdir \";tar zxf \" gambc-dist \".tgz;cd \" gambc-dist \";./configure;make -j 4;mv ../\" gambc-dist \".tgz .;cd prebuilt;make prebuilt'\"))(scp-from timeout (string-append tmpdir \"/\" gambc-dist \"/$(PACKAGE_TARNAME)-*\") \".\")"
+ PATH="gsi:$$PATH" prebuilt/remote-connect $(BUILD_FARM) "" "(define tmpdir \"gambtmp0\")(define gambc-dist \"$(PACKAGE_TARNAME)\")(define timeout 600)(ssh timeout (string-append \"rm -rf \" tmpdir \";mkdir \" tmpdir \";echo 'logged in on:';hostname\"))(scp-to timeout (string-append gambc-dist \".tgz\") (string-append tmpdir \"/.\"))(ssh timeout (string-append \"ssh $(BUILD_HOST) 'cd \" tmpdir \";tar zxf \" gambc-dist \".tgz;cd \" gambc-dist \";./configure;make -j 4;mv ../\" gambc-dist \".tgz .;cd prebuilt;make prebuilt'\"))(scp-from timeout (string-append tmpdir \"/\" gambc-dist \"/$(PACKAGE_TARNAME)-*\") \".\")"
@# cd prebuilt && $(MAKE) $(MDEFINES) $@
stamp: fake_target
View
4 prebuilt/macosx/build-phase2.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
herefromroot="prebuilt/macosx"
rootfromhere="../.."
@@ -51,7 +51,7 @@ install_gambc()
{
cd "$rootfromhere"
make clean
- make
+ make -j 2
make install
if [ "$RUN_TESTS" == "0" ] ; then
View
18 prebuilt/remote-connect
@@ -1,6 +1,6 @@
#! /usr/bin/env gsi
-;; Copyright (c) 2011 by Marc Feeley, All Rights Reserved.
+;; Copyright (c) 2011-2012 by Marc Feeley, All Rights Reserved.
;; This program allows execution of commands on a remote host. The
;; "remote host" may be a real computer or a VM running locally in
@@ -47,18 +47,19 @@
(if (and (equal? pw "") alias (>= (length alias) 4))
(cadddr alias)
pw))
- (if (equal? password "")
+ (if (equal? password "?")
(begin
(print "\nPassword for " username "@" hostname ": ")
(set! password (read-line))
- (print "\n")
- (if (equal? password "")
- (set! password #f))))
+ (print "\n")))
(set! ssh-port
(if (and alias (>= (length alias) 5))
(car (cddddr alias))
22))))
+ (if (equal? password "")
+ (set! password #f))
+
(end-vbox-vm vbox-vm)
(if (not (start-vbox-vm vbox-vm))
(err)
@@ -73,9 +74,10 @@
(define ssh-port #f)
(define host-aliases
- '(("macosx" "Snow-Leopard-x86-VM1")
- ("windows" "Windows-7-Ultimate-x86-VM1")
- ("farm" "frontal.iro.umontreal.ca" "gambit" "" 22)
+ '(("macosx" "Snow-Leopard-x86-VM1")
+ ("windows" "Windows-7-Ultimate-x86-VM1")
+ ("farm" "frontal.iro.umontreal.ca" "gambit" "?" 22)
+ ("localhost" "localhost")
))
;; Name of the VM and username, password and port to connect to the VM
View
4 prebuilt/windows/build-phase2.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved.
+# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
herefromroot="prebuilt/windows"
rootfromhere="../.."
@@ -40,7 +40,7 @@ install_gambc()
{
cd "$rootfromhere"
make clean
- make
+ make -j 2
make install
if [ "$RUN_TESTS" == "0" ] ; then

0 comments on commit aba6a4d

Please sign in to comment.