From 88dd4e4d13c49317029a7f5a3def9a95afb76ebb Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:07:54 +0100 Subject: [PATCH 1/6] Emit 'now set path' message at end of 'make full'. --- makefile | 2 ++ src/tools/make/vishap.make | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/makefile b/makefile index a9185517..4f2dfc60 100644 --- a/makefile +++ b/makefile @@ -139,6 +139,7 @@ full: configuration @make -f src/tools/make/vishap.make -s library @make -f src/tools/make/vishap.make -s install @make -f src/tools/make/vishap.make -s confidence + @make -f src/tools/make/vishap.make -s showpath @@ -169,6 +170,7 @@ library: configuration install: configuration @make -f src/tools/make/vishap.make -s installable @make -f src/tools/make/vishap.make -s install + @make -f src/tools/make/vishap.make -s showpath uninstall: configuration @make -f src/tools/make/vishap.make -s installable diff --git a/src/tools/make/vishap.make b/src/tools/make/vishap.make index 43986b73..cd88c04e 100644 --- a/src/tools/make/vishap.make +++ b/src/tools/make/vishap.make @@ -173,6 +173,10 @@ install: @-cp $(BUILDDIR)/showdef$(BINEXT) "$(INSTALLDIR)/bin" @cp $(BUILDDIR)/lib$(ONAME).* "$(INSTALLDIR)/lib/" @if which ldconfig >/dev/null 2>&1; then $(LDCONFIG); fi + + +# showpath: Describe how to set the PATH variable +showpath: @printf "\nNow add $(INSTALLDIR)/bin to your path, for example with the command:\n" @printf "export PATH=\"$(INSTALLDIR)/bin:\$$PATH\"\n" @printf "\n" From f383a6c0329f5f58ac8627aaa54547e7a7f6bb20 Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:23:18 +0100 Subject: [PATCH 2/6] Correct quoting in postpush.pl. --- src/tools/testcoordinator/postpush.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index 3eb07825..079f9e56 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -31,4 +31,4 @@ flock(LOG, 2) or die "Could not lock postpush.log"; printf LOG strftime("%Y/%m/%d %H.%M.%S", localtime), " Repository $repo, branch $branch, name $name.\n"; close(LOG); -system "ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &"; +system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; From 71e5e38d89ffd5fa80fe49a747ec0ab9a77ae7a8 Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:43:49 +0100 Subject: [PATCH 3/6] Debugging postpush.pl --- src/tools/testcoordinator/postpush.pl | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index 079f9e56..de0eb616 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -9,6 +9,16 @@ use POSIX "strftime"; use CGI qw(:standard escapeHTML); use JSON; +sub writelog { + my ($msg) = @_; + + open(LOG, ">>/tmp/postpush.log") or die "Could not create postpush.log"; + flock(LOG, 2) or die "Could not lock postpush.log"; + print LOG sprintf("%s %s\n", strftime("%Y/%m/%d %H.%M.%S", localtime), $msg); + close(LOG); +} + +writelog "Postpush."; my $postdata = from_json(param('POSTDATA')); @@ -19,16 +29,15 @@ my $name = $postdata->{'head_commit'}->{'author'}->{'name'}; my $branch = $ref; $branch =~ s'^.*\/''; my $repo = $url; $repo =~ s'^.*\/''; +#my $repo="repo"; my $branch="branch"; my $name="name"; + +writelog "Repository $repo, branch $branch, name $name."; print header(), start_html("Vishap Oberon github post push web hook."), p("Repository $repo, branch $branch, name $name."), end_html(); - -open(LOG, ">>/tmp/postpush.log") or die "Could not create postpush.log"; -flock(LOG, 2) or die "Could not lock postpush.log"; -printf LOG strftime("%Y/%m/%d %H.%M.%S", localtime), " Repository $repo, branch $branch, name $name.\n"; -close(LOG); - system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; + +writelog "Buildall triggered." From dff410e5b58b7997cce5f58cac8bebcaec88639d Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:49:22 +0100 Subject: [PATCH 4/6] Debugging postpush.pl --- src/tools/testcoordinator/postpush.pl | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index de0eb616..a3c0c6de 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -20,24 +20,24 @@ sub writelog { writelog "Postpush."; -my $postdata = from_json(param('POSTDATA')); - -my $url = $postdata->{'repository'}->{'url'}; -my $ref = $postdata->{'ref'}; -my $name = $postdata->{'head_commit'}->{'author'}->{'name'}; - -my $branch = $ref; $branch =~ s'^.*\/''; -my $repo = $url; $repo =~ s'^.*\/''; - -#my $repo="repo"; my $branch="branch"; my $name="name"; - -writelog "Repository $repo, branch $branch, name $name."; - -print header(), - start_html("Vishap Oberon github post push web hook."), - p("Repository $repo, branch $branch, name $name."), - end_html(); - -system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; - -writelog "Buildall triggered." +# my $postdata = from_json(param('POSTDATA')); +# +# my $url = $postdata->{'repository'}->{'url'}; +# my $ref = $postdata->{'ref'}; +# my $name = $postdata->{'head_commit'}->{'author'}->{'name'}; +# +# my $branch = $ref; $branch =~ s'^.*\/''; +# my $repo = $url; $repo =~ s'^.*\/''; +# +# #my $repo="repo"; my $branch="branch"; my $name="name"; +# +# writelog "Repository $repo, branch $branch, name $name."; +# +# print header(), +# start_html("Vishap Oberon github post push web hook."), +# p("Repository $repo, branch $branch, name $name."), +# end_html(); +# +# system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; +# +# writelog "Buildall triggered." From 61c9790edc0b97fc1b44b1ce5c0ef1fa86f4838f Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:53:20 +0100 Subject: [PATCH 5/6] Debugging postpush.pl --- src/tools/testcoordinator/postpush.pl | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index a3c0c6de..de0eb616 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -20,24 +20,24 @@ sub writelog { writelog "Postpush."; -# my $postdata = from_json(param('POSTDATA')); -# -# my $url = $postdata->{'repository'}->{'url'}; -# my $ref = $postdata->{'ref'}; -# my $name = $postdata->{'head_commit'}->{'author'}->{'name'}; -# -# my $branch = $ref; $branch =~ s'^.*\/''; -# my $repo = $url; $repo =~ s'^.*\/''; -# -# #my $repo="repo"; my $branch="branch"; my $name="name"; -# -# writelog "Repository $repo, branch $branch, name $name."; -# -# print header(), -# start_html("Vishap Oberon github post push web hook."), -# p("Repository $repo, branch $branch, name $name."), -# end_html(); -# -# system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; -# -# writelog "Buildall triggered." +my $postdata = from_json(param('POSTDATA')); + +my $url = $postdata->{'repository'}->{'url'}; +my $ref = $postdata->{'ref'}; +my $name = $postdata->{'head_commit'}->{'author'}->{'name'}; + +my $branch = $ref; $branch =~ s'^.*\/''; +my $repo = $url; $repo =~ s'^.*\/''; + +#my $repo="repo"; my $branch="branch"; my $name="name"; + +writelog "Repository $repo, branch $branch, name $name."; + +print header(), + start_html("Vishap Oberon github post push web hook."), + p("Repository $repo, branch $branch, name $name."), + end_html(); + +system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; + +writelog "Buildall triggered." From 3a17e1a65685db28158fd65fff295e93a1bec31f Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 27 Jun 2016 17:56:19 +0100 Subject: [PATCH 6/6] Debugging postpush.pl --- src/tools/testcoordinator/postpush.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index de0eb616..947ef1d5 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -9,6 +9,7 @@ use POSIX "strftime"; use CGI qw(:standard escapeHTML); use JSON; + sub writelog { my ($msg) = @_;