Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item11267: be local-perl friendly
the rest is perltidy. somebody doesn't have all git hooks in place?
  • Loading branch information
MichaelDaum committed Aug 26, 2014
1 parent decb614 commit 7c5c390
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions core/tools/build.pl
@@ -1,4 +1,4 @@
#! /usr/bin/perl -w
#! /usr/bin/env perl
#
# Build for Foswiki
# Crawford Currie & Sven Dowideit
Expand All @@ -7,6 +7,7 @@
# the distribution.

use strict;
use warnings;

BEGIN {
use File::Spec;
Expand Down Expand Up @@ -48,7 +49,7 @@ sub new {
if ( my $gitdir = findPathToDir('.git') ) {
print "detected git installation at $gitdir\n";

# Verify that all files are committed and all commits are pushed to github TODO
# Verify that all files are committed and all commits are pushed to github TODO
my $gitstatus = `git status -uno`;
unless ($nocheck) {
die
Expand All @@ -66,7 +67,7 @@ sub new {

#build a name from major.minor.patch.-auto.gitrev
my $rev = `git rev-parse --short HEAD`;
$name = 'Foswiki-' . getCurrentFoswikiRELEASE() . '-auto' . $rev;
$name = 'Foswiki-' . getCurrentFoswikiRELEASE() . '-auto' . $rev;
$autoBuild = 1;
}
if ( $name eq '-commit' ) {
Expand Down Expand Up @@ -217,11 +218,11 @@ END
# Note; the commit is unconditional, because we *must* update
# Foswiki.pm before building.
my $tim = 'BUILD ' . $name . ' at ' . gmtime() . ' GMT';
my $cmd = "git commit -m 'Item000: $tim' ../lib/Foswiki.pm";
my $cmd = "git commit -m 'Item000: $tim' ../lib/Foswiki.pm";

print `$cmd` if $commit;
print "$cmd\n";
die $@ if $@;
print `$cmd` if $commit;
print "$cmd\n";
die $@ if $@;
}
else {
# This is a rebuild, just use the same name.
Expand Down

0 comments on commit 7c5c390

Please sign in to comment.