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" diff --git a/src/tools/testcoordinator/postpush.pl b/src/tools/testcoordinator/postpush.pl index f0edcec7..67be27ab 100644 --- a/src/tools/testcoordinator/postpush.pl +++ b/src/tools/testcoordinator/postpush.pl @@ -18,6 +18,17 @@ sub writelog { close(LOG); } +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')); my $url = $postdata->{'repository'}->{'url'}; @@ -29,6 +40,7 @@ my $repo = $url; $repo =~ s'^.*\/''; #my $repo="repo"; my $branch="branch"; my $name="name"; +<<<<<<< HEAD writelog "Post push github web hook for repository $repo, branch $branch, name $name."; my $child = fork; @@ -41,8 +53,18 @@ if ($child) { exec 'ssh root@oberon "perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &"'; exit; } +======= +writelog "Repository $repo, branch $branch, name $name."; +>>>>>>> 3a17e1a65685db28158fd65fff295e93a1bec31f print header(), start_html("Vishap Oberon github post push web hook."), p("Repository $repo, branch $branch, name $name."), end_html(); +<<<<<<< HEAD +======= + +system 'ssh root@oberon perl vishap/voc/src/tools/testcoordinator/buildall.pl >/tmp/buildall.log &'; + +writelog "Buildall triggered." +>>>>>>> 3a17e1a65685db28158fd65fff295e93a1bec31f