vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 04:02:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unwanted merge commit. Bloody git.

Browse source
This commit is contained in:
David C W Brown 2016-06-27 20:44:12 +01:00
commit a15f943d5b
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
makefile
View file

@ -139,6 +139,7 @@ full: configuration
@make -f src/tools/make/vishap.make -s library @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 install
@make -f src/tools/make/vishap.make -s confidence @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 install: configuration
@make -f src/tools/make/vishap.make -s installable @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 install
@make -f src/tools/make/vishap.make -s showpath
uninstall: configuration uninstall: configuration
@make -f src/tools/make/vishap.make -s installable @make -f src/tools/make/vishap.make -s installable

4
src/tools/make/vishap.make
View file

@ -173,6 +173,10 @@ install:
@-cp $(BUILDDIR)/showdef$(BINEXT) "$(INSTALLDIR)/bin" @-cp $(BUILDDIR)/showdef$(BINEXT) "$(INSTALLDIR)/bin"
@cp $(BUILDDIR)/lib$(ONAME).* "$(INSTALLDIR)/lib/" @cp $(BUILDDIR)/lib$(ONAME).* "$(INSTALLDIR)/lib/"
@if which ldconfig >/dev/null 2>&1; then $(LDCONFIG); fi @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 "\nNow add $(INSTALLDIR)/bin to your path, for example with the command:\n"
@printf "export PATH=\"$(INSTALLDIR)/bin:\$$PATH\"\n" @printf "export PATH=\"$(INSTALLDIR)/bin:\$$PATH\"\n"
@printf "\n" @printf "\n"

22
src/tools/testcoordinator/postpush.pl
View file

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