Commit 9e7bb6b1 authored by Kirk Webb's avatar Kirk Webb

Merge remote-tracking branch 'central/master' into win7devel

parents f8096e28 9379d1d4

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
# #
# Testbed Makefile # Testbed Makefile
# #
...@@ -209,20 +226,24 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1) ...@@ -209,20 +226,24 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C tip client-install @$(MAKE) -C tip client-install
endif endif
subboss: client subboss:
@$(MAKE) -C clientside subboss
@$(MAKE) -C os subboss @$(MAKE) -C os subboss
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
@$(MAKE) -C utils subboss @$(MAKE) -C utils subboss
subboss-install: subboss subboss-install: subboss
@$(MAKE) -C clientside client-install @$(MAKE) -C clientside subboss-install
@$(MAKE) -C os subboss-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1) ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install @$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install @$(MAKE) -C tip client-install
endif endif
@$(MAKE) -C utils subboss-install @$(MAKE) -C utils subboss-install
@$(MAKE) -C os subboss-install
@$(MAKE) -C db subboss-install @$(MAKE) -C db subboss-install
@$(MAKE) -C clientside/tmcc subboss-install
@$(MAKE) -C rc.d subboss-install @$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install @$(MAKE) -C dhcpd subboss-install
# Hack: this should probably be done by a subboss-install # Hack: this should probably be done by a subboss-install
...@@ -298,6 +319,18 @@ frisbee-mfs-nostatic-install: destdircheck frisbee-mfs-nostatic ...@@ -298,6 +319,18 @@ frisbee-mfs-nostatic-install: destdircheck frisbee-mfs-nostatic
@$(MAKE) -C os frisbee-mfs-install @$(MAKE) -C os frisbee-mfs-install
@$(MAKE) -C clientside frisbee-mfs-install @$(MAKE) -C clientside frisbee-mfs-install
newnode-mfs: mfsoscheck
@$(MAKE) -C clientside newnode-mfs
newnode-mfs-nostatic: mfsoscheck
@NOSTATIC=1 $(MAKE) -C clientside newnode-mfs
newnode-mfs-install: destdircheck newnode-mfs client-mkdirs
@$(MAKE) -C clientside newnode-mfs-install
newnode-mfs-nostatic-install: destdircheck newnode-mfs-nostatic client-mkdirs
@$(MAKE) -C clientside newnode-mfs-install
cdboot: mfsoscheck client cdboot: mfsoscheck client
@echo "CD/Dongle files built" @echo "CD/Dongle files built"
......
# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
# Get rid of a bunch of nasty built-in implicit rules, # Get rid of a bunch of nasty built-in implicit rules,
# to avoid bogus circular dependencies and make things go faster. # to avoid bogus circular dependencies and make things go faster.
......
# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
# #
# Most of the configure-substitution magic is done here. # Most of the configure-substitution magic is done here.
# All the other makefiles in the NodeOS include # All the other makefiles in the NodeOS include
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
# #
use English; use English;
......
# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
# #
SRCDIR = @srcdir@ SRCDIR = @srcdir@
......
#!/usr/bin/perl -wT #!/usr/bin/perl -wT
# #
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2012 University of Utah and the Flux Group. # Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved. #
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at