Skip to content

Commit f4de477

Browse files
committed
Sync to geni-portal instead of proto-ch
Embrace the new naming by rsync'ing to geni-portal instead of maintaining proto-ch. Add an autogen.sh to bootstrap the configure script. Remove do-make-install.sh and add geni-portal-install in its place.
1 parent 8c3ad4a commit f4de477

File tree

4 files changed

+30
-41
lines changed

4 files changed

+30
-41
lines changed

Makefile.sync

+8-27
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RSYNC_EXCLUDE = --exclude .git --exclude '*~' \
1111
RSYNC_DELETE = --delete --delete-excluded
1212
RSYNC_ARGS = -aztv $(RSYNC_EXCLUDE)
1313

14+
# This will probably be "../geni-portal"
15+
SRC_DIR = ../$(notdir $(CURDIR))
1416

1517
.PHONY: syncb syncd syncm synci syncs synct syncp syncc
1618

@@ -20,41 +22,20 @@ default:
2022
bin/geni-ch-githash: .git
2123
git rev-parse HEAD > bin/geni-ch-githash
2224

23-
synca: bin/geni-ch-githash
24-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch algonquin.gpolab.bbn.com:
25-
2625
syncb: bin/geni-ch-githash
27-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch bigslide.gpolab.bbn.com:
26+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) bigslide.gpolab.bbn.com:
2827

2928
syncd: bin/geni-ch-githash
30-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch dagoola.gpolab.bbn.com:
31-
32-
synce: bin/geni-ch-githash
33-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch emmons.gpolab.bbn.com:
34-
35-
synch: bin/geni-ch-githash
36-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch haystack.gpolab.bbn.com:
29+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) dagoola.gpolab.bbn.com:
3730

3831
syncm: bin/geni-ch-githash
39-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch marilac.gpolab.bbn.com:
32+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) marilac.gpolab.bbn.com:
4033

4134
synci: bin/geni-ch-githash
42-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch illyrica.gpolab.bbn.com:
43-
44-
syncs: bin/geni-ch-githash
45-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch sergyar.gpolab.bbn.com:
46-
47-
synct: bin/geni-ch-githash
48-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch tau-ceti.gpolab.bbn.com:
49-
50-
synctop: bin/geni-ch-githash
51-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch tabletop.gpolab.bbn.com:
52-
53-
syncp: bin/geni-ch-githash
54-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch panther.gpolab.bbn.com:
35+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) illyrica.gpolab.bbn.com:
5536

5637
syncc: bin/geni-ch-githash
57-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch cascade.gpolab.bbn.com:
38+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) cascade.gpolab.bbn.com:
5839

5940
syncn: bin/geni-ch-githash
60-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch nye.gpolab.bbn.com:
41+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) nye.gpolab.bbn.com:

autogen.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
autoreconf --install --force --symlink || exit 1

bin/do-make-install.sh

-14
This file was deleted.

bin/geni-portal-install

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
# Determine location of this script
4+
declare LOCATION
5+
LOCATION=$0
6+
LOCATION=${LOCATION%/*}
7+
8+
# exit on error
9+
set -e
10+
11+
# echo commands
12+
set -x
13+
14+
cd "${LOCATION}"/..
15+
./autogen.sh
16+
./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/local/bin \
17+
--sbindir=/usr/local/sbin --mandir=/usr/local/man
18+
make
19+
sudo make install

0 commit comments

Comments
 (0)