[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - oowintool sal/qa solenv/bin

Pedro Giffuni pfg at apache.org
Tue Sep 15 09:08:58 PDT 2015


 oowintool                                    |    2 +-
 sal/qa/buildall.pl                           |    2 +-
 sal/qa/helper/gcov/gcov_filter.pl            |    2 +-
 sal/qa/helper/gcov/gcov_result.pl            |    2 +-
 sal/qa/helper/gcov/gcov_resultcompare.pl     |    2 +-
 sal/qa/helper/gcov/gcov_resultinterpreter.pl |    2 +-
 solenv/bin/cleanzip.pl                       |    2 +-
 solenv/bin/cws.pl                            |    2 +-
 solenv/bin/download_missing_extensions.pl    |    2 +-
 solenv/bin/image-sort.pl                     |    2 +-
 solenv/bin/makemani.pl                       |    2 +-
 solenv/bin/modules/osarch.pm                 |    2 +-
 solenv/bin/patch_make_releases_xml.pl        |    2 +-
 solenv/bin/patch_tool.pl                     |    2 +-
 solenv/bin/release_prepare.pl                |    2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 8ed50137cdccce22761160ed0395fee7b487c96f
Author: Pedro Giffuni <pfg at apache.org>
Date:   Tue Sep 15 15:01:59 2015 +0000

    Revert r1700845 for more scripts.
    
    The shebang situation for Windows seems to be a bit odd. Revert the
    change in all the cases where it is likely to cause trouble.
    
    Found and reported by:	damjan

diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 25ae353..a1d2065 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -21,7 +21,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 #**************************************************************
 
-# #!/usr/bin/env perl -w
+# #!/usr/bin/perl -w
 
 use strict;
 use POSIX;
diff --git a/sal/qa/helper/gcov/gcov_filter.pl b/sal/qa/helper/gcov/gcov_filter.pl
index 33ff25c..c5d5758 100755
--- a/sal/qa/helper/gcov/gcov_filter.pl
+++ b/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 #
 # $Id: gcov_filter.pl,v 1.4 2005-11-02 17:23:57 kz Exp $
 #
diff --git a/sal/qa/helper/gcov/gcov_result.pl b/sal/qa/helper/gcov/gcov_result.pl
index 3ab5aba..5e7f46e 100644
--- a/sal/qa/helper/gcov/gcov_result.pl
+++ b/sal/qa/helper/gcov/gcov_result.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/sal/qa/helper/gcov/gcov_resultcompare.pl b/sal/qa/helper/gcov/gcov_resultcompare.pl
index 73ca581..183a12f 100644
--- a/sal/qa/helper/gcov/gcov_resultcompare.pl
+++ b/sal/qa/helper/gcov/gcov_resultcompare.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/sal/qa/helper/gcov/gcov_resultinterpreter.pl b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
index 45e9108..35a9fdc 100644
--- a/sal/qa/helper/gcov/gcov_resultinterpreter.pl
+++ b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index bf7241d..9c4092c 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 #**************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 1a3ed45..59e530b 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 #**************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/download_missing_extensions.pl b/solenv/bin/download_missing_extensions.pl
index c50da9b..9cb664c 100755
--- a/solenv/bin/download_missing_extensions.pl
+++ b/solenv/bin/download_missing_extensions.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#! /usr/bin/perl -w
 
 #**************************************************************
 #
diff --git a/solenv/bin/image-sort.pl b/solenv/bin/image-sort.pl
index 95e44eb..85a7dd8 100755
--- a/solenv/bin/image-sort.pl
+++ b/solenv/bin/image-sort.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index 427680d..5e1369d 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#! /usr/bin/perl -w
     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
         if 0; #$running_under_some_shell
 #**************************************************************
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 48e0be2..1a7fe62 100644
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
diff --git a/solenv/bin/patch_make_releases_xml.pl b/solenv/bin/patch_make_releases_xml.pl
index 296e549..b75046b 100644
--- a/solenv/bin/patch_make_releases_xml.pl
+++ b/solenv/bin/patch_make_releases_xml.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 
 #**************************************************************
 #
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index 2bc2201..36b6351 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 
 #**************************************************************
 #
diff --git a/solenv/bin/release_prepare.pl b/solenv/bin/release_prepare.pl
index 1852f19..ca47308 100644
--- a/solenv/bin/release_prepare.pl
+++ b/solenv/bin/release_prepare.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 
 #**************************************************************
 #
commit 64d85c6662dc9fae9a1fe6882033a55ec395dfc4
Author: Pedro Giffuni <pfg at apache.org>
Date:   Tue Sep 15 14:36:49 2015 +0000

    Revert r1700845  for oowintool.
    
    The shebang situation for Windows seems to be a bit odd. Revert the
    change here as it's affecting the Windows buildbot.
    
    Found and reported by:	damjan

diff --git a/oowintool b/oowintool
old mode 100644
new mode 100755
index bd7b8b6..6c80a9a
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/perl -w
 # *************************************************************
 #  
 #  Licensed to the Apache Software Foundation (ASF) under one


More information about the Libreoffice-commits mailing list