Commit 5535b1a7 authored by Leigh Stoller's avatar Leigh Stoller

Preparation for moving the rspec subdir into its own repo, and

tracking with a git submodule; Move all of the makefiles into a shadow
tree (rspec-emulab), and use VPATH magic (via MOSTLY_SRCDIRS) to
install from the rspec subdir.
parent d352379f
......@@ -7336,10 +7336,11 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/GNUmakefile protogeni/security/GNUmakefile \
protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
protogeni/rspec/0.1/GNUmakefile \
protogeni/rspec/0.2/GNUmakefile \
protogeni/rspec/2/GNUmakefile \
protogeni/test/GNUmakefile \
protogeni/rspec-emulab/GNUmakefile \
protogeni/rspec-emulab/0.1/GNUmakefile \
protogeni/rspec-emulab/0.2/GNUmakefile \
protogeni/rspec-emulab/2/GNUmakefile \
collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/jabber/GNUmakefile \
......
......@@ -1057,10 +1057,11 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/GNUmakefile protogeni/security/GNUmakefile \
protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
protogeni/rspec/0.1/GNUmakefile \
protogeni/rspec/0.2/GNUmakefile \
protogeni/rspec/2/GNUmakefile \
protogeni/test/GNUmakefile \
protogeni/rspec-emulab/GNUmakefile \
protogeni/rspec-emulab/0.1/GNUmakefile \
protogeni/rspec-emulab/0.2/GNUmakefile \
protogeni/rspec-emulab/2/GNUmakefile \
collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/jabber/GNUmakefile \
......
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -11,7 +11,7 @@ SUBDIR = protogeni
include $(OBJDIR)/Makeconf
SUBDIRS = security xmlrpc lib scripts etc rspec
SUBDIRS = security xmlrpc lib scripts etc rspec-emulab
all: all-subdirs
......@@ -23,7 +23,7 @@ install:
@$(MAKE) -C lib install
@$(MAKE) -C scripts install
@$(MAKE) -C etc install
@$(MAKE) -C rspec install
@$(MAKE) -C rspec-emulab install
@$(MAKE) -C test install
install-genischemacheck:
......
#!/usr/bin/perl -wT
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
# All rights reserved.
#
package GeniResource;
......@@ -2206,13 +2206,15 @@ sub Discover($$$)
# Do it.
#
my $method_name = "DiscoverResources";
my $method_hash = { "available" => "true" };
my $method_hash = { "available" => "true",
"rspec_version" => "0.2"};
my @method_args = ($method_hash);
if ($manager_api eq "AM") {
$method_name = "ListResources";
@method_args = ([$slice_credential->asString()],
{'geni_available' => "true"});
{'geni_available' => "true",
'rspec_version' => "0.2"});
}
elsif ($manager_version == 1.0) {
$method_hash->{'credential'} = $slice_credential->asString();
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../..
SUBDIR = protogeni/rspec/0.1
SUBDIR = protogeni/rspec-emulab/0.1
#
# Switch our VPATH over to where the actual files live.
#
MOSTLY_SRCDIRS = $(subst rspec-emulab,rspec,$(SRCDIR))
include $(OBJDIR)/Makeconf
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../..
SUBDIR = protogeni/rspec/0.2
SUBDIR = protogeni/rspec-emulab/0.2
#
# Switch our VPATH over to where the actual files live.
#
MOSTLY_SRCDIRS = $(subst rspec-emulab,rspec,$(SRCDIR))
include $(OBJDIR)/Makeconf
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../..
SUBDIR = protogeni/rspec/2
SUBDIR = protogeni/rspec-emulab/2
#
# Switch our VPATH over to where the actual files live.
#
MOSTLY_SRCDIRS = $(subst rspec-emulab,rspec,$(SRCDIR))
include $(OBJDIR)/Makeconf
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = protogeni/rspec
SUBDIR = protogeni/rspec-emulab
include $(OBJDIR)/Makeconf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment