[Libreoffice-commits] .: 2 commits - bootstrap.1 configure.in set_soenv.in source_soenv.sh tail_build/Makefile

Tor Lillqvist tml at kemper.freedesktop.org
Sun Jul 24 14:56:31 PDT 2011


 bootstrap.1         |    5 --
 configure.in        |    8 +--
 set_soenv.in        |  105 ++++++++++++++++++--------------------------
 source_soenv.sh     |  124 ----------------------------------------------------
 tail_build/Makefile |    2 
 5 files changed, 51 insertions(+), 193 deletions(-)

New commits:
commit 22d9caecc978a5739ddd1430fd26abe06454726c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 25 00:46:39 2011 +0300

    Use fixed-name environment script and no source_soenv.sh
    
    No longer call the script snippet LinuxX86Env.Set.sh,
    MacOSXX86Env.Set.sh, etc, but always Env.Host.sh. No need for
    source_soenv.sh then, which wouldn't have worked when cross-compiling
    anyway.
    
    (As before, when cross-compiling, the environment script snipppet for
    the BUILD platform is called Env.Build.sh.)

diff --git a/bootstrap.1 b/bootstrap.1
index e398be8..069b995 100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -1,13 +1,13 @@
 
 if test -z "${SOLARENV}"; then
-    if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi
+    if test -f ./Env.Host.sh; then . ./Env.Host.sh; fi
 fi
 if test -z "${SOLARENV}"; then
     echo "bootstrap: No environment set!"
     exit 1
 fi
 
-# remove aliases set by *Env.Set.sh
+# remove aliases set by Env.Host.sh
 unalias mkout
 unalias deliver
 unalias build
diff --git a/configure.in b/configure.in
index 155e8e0..417c445 100755
--- a/configure.in
+++ b/configure.in
@@ -1724,9 +1724,9 @@ if test "$cross_compiling" = "yes"; then
         --disable-zenity \
         $sub_conf_opts \
         2>&1 | sed -e 's/^/    /'
-    test -f ./*Env.Set.sh 2>/dev/null || exit
-    cp *Env.Set.sh ../Env.Build.sh
-    . ./*Env.Set.sh
+    test -f ./Env.Host.sh 2>/dev/null || exit
+    cp Env.Host.sh ../Env.Build.sh
+    . ./Env.Host.sh
     for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
              SYSTEM_LIBXSLT; do
         VV='$'$V
@@ -8701,7 +8701,7 @@ else
     echo > set_soenv.stamp
 fi
 
-dnl Run the set_soenv script to setup the *Env.sh script that sets
+dnl Run the set_soenv script to setup the Env.Host.sh script that sets
 dnl environment variables for the build.
 chmod +x set_soenv
 
diff --git a/set_soenv.in b/set_soenv.in
index ec80ee5..ebfad11 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -36,7 +36,7 @@ use File::Basename;
 # IIa. Declaring variables for the system commands, etc.
 #--------------------------------------------------------
 #
-my ( $outfile, $bootfile, $newline, $comment,
+my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
      $compiler, $ds, $ps,
      $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
      $USE_MINGW, $platform,
@@ -186,10 +186,10 @@ if ( $platform =~ m/solaris/ )
    if ($platform =~ m/^i[3456]86/)
    {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisX86GccEnv.Set.sh";
+         $oldoutfile     = "SolarisX86GccEnv.Set.sh";
          $OUTPATH        = "unxsogi";
       } else {
-         $outfile        = "SolarisX86Env.Set.sh";
+         $oldoutfile     = "SolarisX86Env.Set.sh";
          $OUTPATH        = "unxsoli4";
       }
       $CPU            = "I";
@@ -202,10 +202,10 @@ if ( $platform =~ m/solaris/ )
    else
    {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisSparcGccEnv.Set.sh";
+         $oldoutfile     = "SolarisSparcGccEnv.Set.sh";
          $OUTPATH        = "unxsogs";
       } else {
-         $outfile        = "SolarisSparcEnv.Set.sh";
+         $oldoutfile     = "SolarisSparcEnv.Set.sh";
          $OUTPATH        = "unxsols4";
       }
       $CPU            = "S";
@@ -272,7 +272,7 @@ elsif ( $platform =~ m/netbsd/ )
       $OS             = "NETBSD";
       $PATH_SEPERATOR = $ps;
       $OUTPATH        = "unxnbsd";
-      $outfile        = "NetBSDEnv.Set.sh";
+      $oldoutfile     = "NetBSDEnv.Set.sh";
       $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/kfreebsd/ )
@@ -290,7 +290,7 @@ elsif ( $platform =~ m/kfreebsd/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting GNU/kFreeBSD x86 specific values... ";
-      $outfile        = "GNUkFreeBSDX86Env.Set.sh";
+      $oldoutfile     = "GNUkFreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxkfgi6";
@@ -302,7 +302,7 @@ elsif ( $platform =~ m/kfreebsd/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting GNU/kFreeBSD x86-64 specific values... ";
-      $outfile        = "GNUkFreeBSDX86-64Env.Set.sh";
+      $oldoutfile     = "GNUkFreeBSDX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxkfgx6";
@@ -326,7 +326,7 @@ elsif ( $platform =~ m/freebsd/ )
    if ($platform =~ m/^(amd64|x86_64)/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
-      $outfile        = "FreeBSDAMDEnv.Set.sh";
+      $oldoutfile     = "FreeBSDAMDEnv.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxfbsdx";
@@ -345,7 +345,7 @@ elsif ( $platform =~ m/freebsd/ )
    }
    elsif ($platform =~ m/^i386/)
    {  print "Setting FreeBSD x86 specific values... ";
-      $outfile        = "FreeBSDX86Env.Set.sh";
+      $oldoutfile     = "FreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxfbsdi";
@@ -369,7 +369,7 @@ elsif ( $platform =~ m/openbsd/ )
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
       $OUTPATH        = "unxobsd";
-      $outfile        = "OpenBSDEnv.Set.sh";
+      $oldoutfile     = "OpenBSDEnv.Set.sh";
    if ($platform =~ m/^(amd64|x86_64)/)
    {
       print "Setting OpenBSD AMD64 specific values... ";
@@ -408,7 +408,7 @@ elsif ( $platform =~ m/linux/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting Linux x86 specific values... ";
-      $outfile        = "LinuxX86Env.Set.sh";
+      $oldoutfile     = "LinuxX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
 
@@ -433,7 +433,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting Linux x86-64 specific values... ";
-      $outfile        = "LinuxX86-64Env.Set.sh";
+      $oldoutfile     = "LinuxX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxlngx6";
@@ -445,7 +445,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^ia64/)
    {  print "Setting Linux ia64 specific values... ";
-      $outfile        = "LinuxIA64Env.Set.sh";
+      $oldoutfile     = "LinuxIA64Env.Set.sh";
       $CPU            = "A";
       $CPUNAME        = "IA64";
       $OUTPATH        = "unxlnga";
@@ -456,7 +456,7 @@ elsif ( $platform =~ m/linux/ )
    elsif ($platform =~ m/^sparc/)
 
    {  print "Setting Linux Sparc specific values... ";
-      $outfile        = "LinuxSparcEnv.Set.sh";
+      $oldoutfile     = "LinuxSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
       $OUTPATH        = "unxlngs";
@@ -468,7 +468,7 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux PPC64 specific values... ";
-         $outfile = "LinuxPPC64Env.Set.sh";
+         $oldoutfile = "LinuxPPC64Env.Set.sh";
          $OUTPATH = "unxlngppc64";
          $CPUNAME = "POWERPC64";
 
@@ -486,7 +486,7 @@ elsif ( $platform =~ m/linux/ )
       }
       else {
          print "Setting Linux PPC specific values... ";
-         $outfile = "LinuxPPCEnv.Set.sh";
+         $oldoutfile = "LinuxPPCEnv.Set.sh";
          $OUTPATH = "unxlngppc";
          $CPUNAME = "POWERPC";
 
@@ -514,14 +514,14 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux zSeries specific values... ";
-         $outfile        = "LinuxS390XEnv.Set.sh";
+         $oldoutfile     = "LinuxS390XEnv.Set.sh";
          $CPUNAME        = "S390X";
 	 $ARCH           = "s390x";
          $OUTPATH        = "unxlngs390x";
       }
       else {
          print "Setting Linux S/390 specific values... ";
-         $outfile        = "LinuxS390Env.Set.sh";
+         $oldoutfile     = "LinuxS390Env.Set.sh";
          $CPUNAME        = "S390";
 	 $ARCH           = "s390";
          $OUTPATH        = "unxlngs390";
@@ -533,7 +533,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^m68k/)
    {  print "Setting Linux m68k specific values... ";
-      $outfile        = "LinuxM68KEnv.Set.sh";
+      $oldoutfile     = "LinuxM68KEnv.Set.sh";
       $CPU            = "6";
       $CPUNAME        = "M68K";
       $OUTPATH        = "unxlngm68k";
@@ -543,7 +543,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^hppa/)
    {  print "Setting Linux hppa specific values... ";
-      $outfile        = "LinuxHPPAEnv.Set.sh";
+      $oldoutfile     = "LinuxHPPAEnv.Set.sh";
       $CPU            = "H";
       $CPUNAME        = "HPPA";
       $OUTPATH        = "unxlnghppa";
@@ -554,7 +554,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^alpha/)
    {  print "Setting Linux Alpha specific values... ";
-      $outfile        = "LinuxAlphaEnv.Set.sh";
+      $oldoutfile     = "LinuxAlphaEnv.Set.sh";
       $CPU            = "L";
       $CPUNAME        = "AXP";
       $OUTPATH        = "unxlngaxp";
@@ -564,7 +564,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^arm.*?l-/)
    {  print "Setting Linux ARM specific values... ";
-      $outfile        = "LinuxARMEnv.Set.sh";
+      $oldoutfile     = "LinuxARMEnv.Set.sh";
       $CPU            = "R";
       $CPUNAME        = "ARM";
       $OUTPATH        = "unxlngr";
@@ -577,7 +577,7 @@ elsif ( $platform =~ m/linux/ )
    {  print "Setting Android ARM specific values... ";
       $GUIBASE        = "android";
       $OS             = "ANDROID";
-      $outfile        = "AndroidARMEnv.Set.sh";
+      $oldoutfile     = "AndroidARMEnv.Set.sh";
       $CPU            = "R";
       $CPUNAME        = "ARM";
       $OUTPATH        = "unxandr";
@@ -588,7 +588,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^mips/)
    {  print "Setting Linux MIPS specific values... ";
-      $outfile        = "LinuxMIPSEnv.Set.sh";
+      $oldoutfile     = "LinuxMIPSEnv.Set.sh";
       $CPU            = "M";
       $CPUNAME        = "GODSON";
       $OUTPATH        = "unxlngmips";
@@ -660,7 +660,7 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
 
       $PATH_SEPERATOR = ';';
       $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
-      $outfile        = "WindowsMinGWEnv.Set.sh";
+      $oldoutfile     = "WindowsMinGWEnv.Set.sh";
       $COMPATH        = PathFormat('@COMPATH@/bin');
       $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
@@ -671,7 +671,7 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   }
   else # The MSVC section starts here
   {   print "Setting Windows (MSVC) specific values... ";
-      $outfile        = "WindowsMSVCEnv.Set.sh";
+      $oldoutfile     = "WindowsMSVCEnv.Set.sh";
       $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci at COMEX@";
@@ -704,7 +704,7 @@ elsif ( $platform =~ m/darwin/ )
       if ($platform =~ m/^arm/)
       {
           print "Setting values for iOS... ";
-          $outfile        = "iOSEnv.Set.sh";
+          $oldoutfile     = "iOSEnv.Set.sh";
           $CPU            = "R";
           $CPUNAME        = "ARM";
           $OUTPATH        = "unxiosr";
@@ -715,7 +715,7 @@ elsif ( $platform =~ m/darwin/ )
       elsif ($platform =~ m/^powerpc/)
       {
           print "Setting values for Mac OS X/Darwin on PowerPC... ";
-          $outfile        = "MacOSXPPCEnv.Set.sh";
+          $oldoutfile     = "MacOSXPPCEnv.Set.sh";
           $CPU            = "P";
           $CPUNAME        = "POWERPC";
           $OUTPATH        = "unxmacxp";
@@ -725,7 +725,7 @@ elsif ( $platform =~ m/darwin/ )
       else
       {
           print "Setting values for Mac OS X/Darwin on default x86... ";
-          $outfile        = "MacOSXX86Env.Set.sh";
+          $oldoutfile     = "MacOSXX86Env.Set.sh";
           $CPU            = "I";
           $CPUNAME        = "INTEL";
           $OUTPATH        = "unxmacxi";
@@ -768,13 +768,13 @@ elsif ( $platform =~ m/dragonfly/ )
       $OS             = "DRAGONFLY";
       $PATH_SEPERATOR = $ps;
       $OUTPATH        = "unxdfly";
-      $outfile        = "DragonFlyEnv.Set.sh";
+      $oldoutfile     = "DragonFlyEnv.Set.sh";
       $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/aix/ )
 {
    print "Setting AIX PPC specific values... ";
-   $outfile        = "aixPPCEnv.Set.sh";
+   $oldoutfile     = "aixPPCEnv.Set.sh";
    $CPU            = "P";
    $CPUNAME        = "POWERPC";
    $OUTPATH        = "unxaigppc";
@@ -802,7 +802,6 @@ print "done\n";
 # If the directory does not exist something is strange.
 # 1. LibreOffice build home directory.
 chomp($SRC_ROOT  = `pwd`);
-$SRC_ROOT =~ s/\/config_office//;
 $SRC_ROOT = PathFormat($SRC_ROOT);
 CheckPathExist( $SRC_ROOT );
 
@@ -1466,8 +1465,16 @@ else
 # VI. Open the output file.
 #--------------------------
 #
-open( OUT, ">$outfile" ) ||
-   die "Cannot open $outfile: $!\n";
+if (-f $SRC_ROOT.$ds.$oldoutfile) {
+    print "****\n";
+    print "**** Note: There is no $oldoutfile any more. Now it is just called Env.Host.sh\n";
+    print "****\n";
+    unlink($SRC_ROOT.$ds.$oldoutfile);
+}
+$outfile = 'Env.Host.sh';
+
+open( OUT, ">$SRC_ROOT/$outfile" ) ||
+   die "Cannot open $SRC_ROOT/$outfile: $!\n";
 
 #
 #------------------------------------------
@@ -2104,27 +2111,8 @@ print OUT "unset $unsetvars$newline";
 # VIII. Closing output file.
 #---------------------------
 #
-close( OUT ) || print "Can't close $outfile: $!";
+close( OUT ) || print "Can't close $SRC_ROOT/$outfile: $!";
 
-#
-#------------------------------
-# IX. Sourcing the output file.
-#------------------------------
-#
-#---------------------------------
-# X. Set up the build environment.
-#---------------------------------
-#
-#--------------------------------------------------------
-# XI. Moving the output file to the build home directory.
-#--------------------------------------------------------
-#
-$tmp = $SRC_ROOT.$ds.$outfile;
-if (rename( $outfile, $tmp ) ne 1)
-{  `mv -f $outfile $tmp`;
-}
-
-#
 #--------------------------------------------------------
 # XII. Message at the end.
 #--------------------------------------------------------
diff --git a/source_soenv.sh b/source_soenv.sh
deleted file mode 100755
index 30ccf5c..0000000
--- a/source_soenv.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# if no environment is set, try to find one, and source it
-# user can override auto-detection via SOLAR_SHELL_ENVIRONMENT
-# it is not currently possible to handle corner cases like you have an
-# AMD64 linux box, create configure environments for both x86 and x86_64,
-# and then expect to auto-detect both.
-# use SOLAR_SHELL_ENVIRONMENT in such cases.
-
-me=source_soenv.sh
-
-if test -n "${SOLARENV}"; then
-    echo "$me: error: only call this if you do not have an environment set!"
-    exit 1
-fi
-
-if test -n "${SOLAR_SHELL_ENVIRONMENT}"; then
-    if test -f "${SOLAR_SHELL_ENVIRONMENT}"; then
-        . "${SOLAR_SHELL_ENVIRONMENT}"
-    else
-        echo "$me: error: \$SOLAR_SHELL_ENVIRONMENT set, but the file does not exist"
-        exit 1
-    fi
-else
-    config_guess_result=`./config.guess`
-    case "${config_guess_result}" in
-        i[3456]86-*-solaris*)
-            . ./SolarisX86Env.Set.sh
-        ;;
-        sparc-*-solaris*)
-            . ./SolarisSparcEnv.Set.sh
-        ;;
-        i[3456]86-*-linux*)
-            . ./LinuxX86Env.Set.sh
-        ;;
-        x86_64-*-linux*)
-            . ./LinuxX86-64Env.Set.sh
-        ;;
-        ia64-*-linux*)
-            . ./LinuxIA64Env.Set.sh
-        ;;
-        sparc-*-linux*)
-            . ./LinuxSparcEnv.Set.sh
-        ;;
-        powerpc-*-linux*)
-            . ./LinuxPPCEnv.Set.sh
-        ;;
-        powerpc64-*-linux*)
-            . ./LinuxPPC64Env.Set.sh
-        ;;
-        s390-*-linux*)
-            . ./LinuxS390Env.Set.sh
-        ;;
-        s390x-*-linux*)
-            . ./LinuxS390XEnv.Set.sh
-        ;;
-        m68k-*-linux*)
-            . ./LinuxM68KEnv.Set.sh
-        ;;
-        hppa-*-linux*)
-            . ./LinuxHPPAEnv.Set.sh
-        ;;
-        alpha-*-linux*)
-            . ./LinuxAlphaEnv.Set.sh
-        ;;
-        arm*-*-linux*)
-            . ./LinuxARMEnv.Set.sh
-        ;;
-        mips-*-linux*)
-            . ./LinuxMIPSEnv.Set.sh
-        ;;
-        i386-*-freebsd*)
-            . ./FreeBSDX86Env.Set.sh
-        ;;
-        amd64-*-freebsd*)
-            . ./FreeBSDAMDEnv.Set.sh
-        ;;
-        # the result here (whether you get x86_64) seems to depend on $CC...
-        i[3456]86-*-darwin*|x86_64-*-darwin*)
-            . ./MacOSXX86Env.Set.sh
-        ;;
-        powerpc-*-darwin*)
-            . ./MacOSXPPCEnv.Set.sh
-        ;;
-        *-cygwin*)
-            . ./WindowsMSVCEnv.Set.sh || . ./WindowsMinGWEnv.Set.sh
-        ;;
-        *)
-            echo "$me: error: unknown *Env.Set.sh for: ${config_guess_result}"
-            exit 1
-        ;;
-    esac
-fi
-if test -z "${SOLARENV}"; then
-    echo "$me: error: No environment set!"
-    exit 1
-fi
-
diff --git a/tail_build/Makefile b/tail_build/Makefile
index 4773523..ffea455 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -29,7 +29,7 @@
 ifeq ($(strip $(SOLARENV)),)
 
 all:
-	if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi && \
+	if test -f ./Env.Host.sh; then . ./Env.Host.sh; fi && \
 	if test -z "$${SOLARENV}"; then echo "No environment set!"; exit 1; fi && \
 	$(MAKE)
 
commit b74f61df221c03c31b9e08ff32df1a569b447014
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 25 00:27:11 2011 +0300

    Bin pointless "nmake=dmake" alias, who needs that?

diff --git a/bootstrap.1 b/bootstrap.1
index ea884a1..e398be8 100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -13,7 +13,6 @@ unalias deliver
 unalias build
 unalias build_client
 unalias zipdep
-unalias nmake
 
 # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
 # Use spawn instead of fork when building dmake on cygwin. 
diff --git a/set_soenv.in b/set_soenv.in
index 8f29220..ec80ee5 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -91,7 +91,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
 # IId. Declaring the aliases.
 #-------------------------------------------
 #
-my ( $dmake, $build, $build_client, $nmake, $mkout, $deliver, $zipdep );
+my ( $dmake, $build, $build_client, $mkout, $deliver, $zipdep );
 #
 
 #-------------------------------------------------------------
@@ -1460,8 +1460,6 @@ else
 	$build           = '"perl $SOLARENV/bin/build.pl"';
 	$build_client    = '"perl $SOLARENV/bin/build_client.pl"';
 	$zipdep          = '"perl $SOLARENV/bin/zipdep.pl"';
-# 3. alias for a full product make
-$nmake           = '"dmake"';
 
 #
 #--------------------------
@@ -2085,9 +2083,6 @@ ToFile( "alias deliver",     $deliver,           "a" );
 ToFile( "alias build",       $build,             "a" );
 ToFile( "alias build_client",$build_client,      "a" );
 ToFile( "alias zipdep",      $zipdep,            "a" );
-if ( $platform !~ m/cygwin/ )
-{  ToFile( "alias nmake",       $nmake,             "a" );
-}
 
 # on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
 if ($platform =~ m/solaris|darwin|freebsd/)


More information about the Libreoffice-commits mailing list