[ooo-build-commit] .: 3 commits - .gitignore set_soenv.in

[Tor Lillqvist]

 .gitignore   |    5 ++---
 set_soenv.in |    3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 188a7812129de39c7079d6f240b47fef38d09d7e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 17 00:09:18 2010 +0300

    Remove aclocal.m4 as _rene_ wants

diff --git a/.gitignore b/.gitignore
index 4c33097..dddafc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@
 # autoconf generated stuff
 /ChangeLog
 /configure
-/aclocal.m4
 
 /*/*.exe
commit e2ddc428173d9231d37004c79fdec70fc1904a51
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 17 00:07:20 2010 +0300

    Ignore all Windows build dirs

diff --git a/.gitignore b/.gitignore
index 24a006b..4c33097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 # the build directories
 /*/unxlng??
 /*/unxlng??.pro
+/*/wntmsci??
+/*/wntmsci??.pro
 
 # autoconf generated stuff
 /ChangeLog
@@ -12,5 +14,3 @@
 /aclocal.m4
 
 /*/*.exe
-/solenv/wntmsci??
-/solenv/wntmsci??.pro
commit 44330c77a5ef75748616a435b3c10c8b47e2d5e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 17 00:05:22 2010 +0300

    Avoid symlinks in solenv path on Cygwin

diff --git a/set_soenv.in b/set_soenv.in
index 502ab5e..d050c4b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -994,7 +994,7 @@ $DEVROOT              = '$SRC_ROOT';
 # Set solenv and solver to given or default values. 
 # Location of the solenv tree.
 if ('@LOCAL_SOLENV@' eq "DEFAULT")
-{  $SOLARENV          = $SRC_ROOT.$SOLENV;
+{  $SOLARENV          = PathFormat($SRC_ROOT.$SOLENV);
 }
 else
 {  $SOLARENV          =  PathFormat('@LOCAL_SOLENV@');
@@ -2321,6 +2321,7 @@ sub PathFormat
        # Replace absolute paths or DOS paths with ...
        if ( ( $variable =~ m/^\// ) or ( $variable =~ m/:/ ) ) {
            # mixed mode paths
+           chomp( $variable = qx{realpath "$variable"} );
            chomp( $variable = qx{cygpath -m "$variable"} );
        }
    }