incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1204412 - in /incubator/ooo/trunk/main: ./ dmake/ dmake/dbug/ dmake/mac/ dmake/man/ dmake/msdos/ dmake/os2/ dmake/qssl/ dmake/readme/ dmake/startup/ dmake/tests/ dmake/tos/ dmake/unix/ dmake/win95/ dmake/winnt/
Date Mon, 21 Nov 2011 09:25:09 GMT
Author: jsc
Date: Mon Nov 21 09:25:07 2011
New Revision: 1204412

URL: http://svn.apache.org/viewvc?rev=1204412&view=rev
Log:
118604: remove license incompatible dmake, thanks to André Fischer (af)

Removed:
    incubator/ooo/trunk/main/dmake/COPYING
    incubator/ooo/trunk/main/dmake/ChangeLog
    incubator/ooo/trunk/main/dmake/INSTALL
    incubator/ooo/trunk/main/dmake/Makefile.am
    incubator/ooo/trunk/main/dmake/Makefile.in
    incubator/ooo/trunk/main/dmake/NEWS
    incubator/ooo/trunk/main/dmake/acinclude.m4
    incubator/ooo/trunk/main/dmake/aclocal.m4
    incubator/ooo/trunk/main/dmake/alloc.h
    incubator/ooo/trunk/main/dmake/autogen.sh
    incubator/ooo/trunk/main/dmake/compile
    incubator/ooo/trunk/main/dmake/config.guess
    incubator/ooo/trunk/main/dmake/config.h.in
    incubator/ooo/trunk/main/dmake/config.sub
    incubator/ooo/trunk/main/dmake/configure
    incubator/ooo/trunk/main/dmake/configure.in
    incubator/ooo/trunk/main/dmake/dag.c
    incubator/ooo/trunk/main/dmake/db.h
    incubator/ooo/trunk/main/dmake/dbug/
    incubator/ooo/trunk/main/dmake/depcomp
    incubator/ooo/trunk/main/dmake/dmake.c
    incubator/ooo/trunk/main/dmake/dmake.h
    incubator/ooo/trunk/main/dmake/dmakeroot.h.in
    incubator/ooo/trunk/main/dmake/dmdump.c
    incubator/ooo/trunk/main/dmake/dmstring.c
    incubator/ooo/trunk/main/dmake/dstdarg.h
    incubator/ooo/trunk/main/dmake/expand.c
    incubator/ooo/trunk/main/dmake/extern.h
    incubator/ooo/trunk/main/dmake/function.c
    incubator/ooo/trunk/main/dmake/getinp.c
    incubator/ooo/trunk/main/dmake/hash.c
    incubator/ooo/trunk/main/dmake/imacs.c
    incubator/ooo/trunk/main/dmake/infer.c
    incubator/ooo/trunk/main/dmake/install-sh
    incubator/ooo/trunk/main/dmake/itypes.h
    incubator/ooo/trunk/main/dmake/mac/
    incubator/ooo/trunk/main/dmake/macparse.c
    incubator/ooo/trunk/main/dmake/make.bat
    incubator/ooo/trunk/main/dmake/make.c
    incubator/ooo/trunk/main/dmake/make.cmd
    incubator/ooo/trunk/main/dmake/makefile.mk
    incubator/ooo/trunk/main/dmake/man/
    incubator/ooo/trunk/main/dmake/missing
    incubator/ooo/trunk/main/dmake/mkinstalldirs
    incubator/ooo/trunk/main/dmake/msdos/
    incubator/ooo/trunk/main/dmake/os2/
    incubator/ooo/trunk/main/dmake/parse.c
    incubator/ooo/trunk/main/dmake/path.c
    incubator/ooo/trunk/main/dmake/percent.c
    incubator/ooo/trunk/main/dmake/posix.h
    incubator/ooo/trunk/main/dmake/qssl/
    incubator/ooo/trunk/main/dmake/quit.c
    incubator/ooo/trunk/main/dmake/rcsclean.awk
    incubator/ooo/trunk/main/dmake/readme/
    incubator/ooo/trunk/main/dmake/rulparse.c
    incubator/ooo/trunk/main/dmake/stamp-h
    incubator/ooo/trunk/main/dmake/startup/
    incubator/ooo/trunk/main/dmake/stat.c
    incubator/ooo/trunk/main/dmake/state.c
    incubator/ooo/trunk/main/dmake/stdmacs.h
    incubator/ooo/trunk/main/dmake/struct.h
    incubator/ooo/trunk/main/dmake/sysintf.c
    incubator/ooo/trunk/main/dmake/tests/
    incubator/ooo/trunk/main/dmake/tos/
    incubator/ooo/trunk/main/dmake/unix/
    incubator/ooo/trunk/main/dmake/vextern.h
    incubator/ooo/trunk/main/dmake/win95/
    incubator/ooo/trunk/main/dmake/winnt/
Modified:
    incubator/ooo/trunk/main/bootstrap.1
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/fetch_tarballs.sh
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/bootstrap.1
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bootstrap.1?rev=1204412&r1=1204411&r2=1204412&view=diff
==============================================================================
--- incubator/ooo/trunk/main/bootstrap.1 (original)
+++ incubator/ooo/trunk/main/bootstrap.1 Mon Nov 21 09:25:07 2011
@@ -3,61 +3,12 @@
 # Use spawn instead of fork when building dmake on cygwin. 
 if test "$GUI" = "WNT"; then
     EXEEXT=".exe"
-    DMAKE_CONF="--enable-spawn"
 else
     EXEEXT=""
-    DMAKE_CONF=""
 fi
 export EXEEXT
 
-# ------------------------------------------------------------------------------
-# Build dmake
-
-if test "$BUILD_DMAKE" != "NO"; then
-
-    if test ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
-
-        cd "$SRC_ROOT/dmake" || exit
-
-        # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
-        # but we need a cygwin/gcc build dmake to understand the posix paths
-        if test "$GUI" = "WNT"; then
-            CC=""
-            CXX=""
-            export CC
-            export CXX
-        fi
-
-        # For normal unixy systems
-        if test -f "Makefile" ; then
-            $GNUMAKE distclean || exit
-        fi
-
-        ./configure $DMAKE_CONF || exit
-
-        ## invoke the gnu make command set by configure.
-        $GNUMAKE || exit
-
-        echo ""
-        echo "dmake has been successfully built"
-
-        cd ..
-
-    else
-
-        echo ""
-        echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
-
-    fi
-
-fi
-
 mkdir -p "$SOLARENV/$OUTPATH/bin"
-if test "$BUILD_DMAKE" != "NO"; then
-    cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
-    echo ""
-    echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
-fi
 
 if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then
   echo ""
@@ -66,7 +17,7 @@ if test "$GUI" = "WNT" -a ! -x "$SOLAREN
   $GNUMAKE || exit
   echo ""
   echo "guw has been successfully made"
-  cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit
+  cp -f "$SRC_ROOT/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin/guw$EXEEXT" || exit
   echo ""
   echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT"
 fi
@@ -82,3 +33,94 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstli
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
 	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
 fi
+
+# ------------------------------------------------------------------------------
+# Build dmake
+
+if test -n "$DMAKE_URL" -a  ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+
+    # Assume that the dmake archive has been downloaded by fetch_tarballs.sh
+    # Determine the name of the downloaded file.
+    dmake_package_name=`echo $DMAKE_URL | sed "s/^\(.*\/\)//"`
+
+    tmp_build_dir="$SOLARENV/$OUTPATH/misc/build/"
+    echo "making and entering $tmp_build_dir"
+    # Clean up any residues from a previous and unsuccessful build.
+    rm -rf "$tmp_build_dir"
+    mkdir -p "$tmp_build_dir"
+    cd "$tmp_build_dir" || exit
+
+    dmake_full_package_name="$TARFILE_LOCATION/$dmake_package_name"
+    if test "$GUI" = "WNT"; then
+        dmake_full_package_name=`cygpath -u "$dmake_full_package_name"`
+    fi
+    echo "unpacking $dmake_full_package_name"
+
+    # Unpack it.
+    case $dmake_package_name in
+        *.tar.gz)
+            tar -xzf "$dmake_full_package_name"
+            dmake_directory_name=`echo $dmake_package_name | sed "s/\(\.tar.gz\)//"`
+            ;;
+        *.tgz)
+            tar -xzf "$dmake_full_package_name"
+            dmake_directory_name=`echo $dmake_package_name | sed "s/\(\.tgz\)//"`
+            ;;
+        *.tar.bz2)
+            tar -xjf "$dmake_full_package_name"
+            dmake_directory_name=`echo $dmake_package_name | sed "s/\(\.tar.bz2\)//"`
+            ;;
+        *.zip)
+            unzip "$dmake_full_package_name"
+            dmake_directory_name=`echo $dmake_package_name | sed "s/\(\.zip\)//"`
+            ;;
+        *)
+            echo "can not unpack the dmake source"
+            dmake_directory_name=
+            exit 1
+            ;;        
+    esac
+
+    echo "entering $dmake_directory_name"
+    cd "$dmake_directory_name" || exit
+
+    # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
+    # but we need a cygwin/gcc build dmake to understand the posix paths
+    if test "$GUI" = "WNT"; then
+        CC=""
+        CXX=""
+        export CC
+        export CXX
+        DMAKE_CONF="--enable-spawn"
+    else
+        DMAKE_CONF=""
+    fi
+
+    # For unixy systems
+    if test -f "Makefile" ; then
+        $GNUMAKE distclean || exit
+    fi
+
+    ./configure $DMAKE_CONF || exit
+        
+    ## invoke the gnu make command set by configure.
+    $GNUMAKE || exit
+
+
+    # Deploy the dmake executable to solenv
+    cp -f "$tmp_build_dir/$dmake_directory_name/dmake$EXEEXT" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
|| exit
+    echo ""
+    echo "dmake successfully built and copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+    echo ""
+
+    # Clean up.  Note that this is skipped when one of the exits is executed above.
+    rm -rf "$tmp_build_dir"
+
+else
+
+    if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+        echo ""
+        echo "dmake present in $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+    fi
+    
+fi

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1204412&r1=1204411&r2=1204412&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Nov 21 09:25:07 2011
@@ -16,6 +16,16 @@ AC_REVISION( $Revision: 1.290 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
+AC_ARG_WITH(dmake-path,
+[  --with-dmake-path=<PATH TO EXECUTABLE>   Specify the location of dmake ],
+[  DMAKE_PATH="$withval"
+])
+AC_ARG_WITH(dmake-url,
+[  --with-dmake-url=<URL>   Specify the location of downloadable dmake source code.
For example:
+                          http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2
+                          Note that dmake is under GPL license.],
+[  DMAKE_URL="$withval"
+])
 AC_ARG_WITH(gnu-patch,
 [  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD
 ],,)
@@ -1618,6 +1628,73 @@ fi
 AC_SUBST(GNUMAKE)
 
 dnl ===================================================================
+dnl Search for a pre-installed dmake
+dnl ===================================================================
+AC_MSG_CHECKING([for dmake])
+AC_PATH_PROG(DMAKE, dmake, no)
+if test "$DMAKE" != "no"; then
+   AC_MSG_RESULT([using system dmake])
+else
+   # Did not find pre-installed dmake.
+   # Is it at a nonstandard location provided by --with-dmake-path ?
+   if test -n "$with_dmake_path" ; then
+      AC_PATH_PROG(DMAKE, dmake, no, "$with_dmake_path")
+      if test "$DMAKE" != "no"; then
+         AC_MSG_RESULT([using user provided dmake])
+      fi
+   fi
+fi
+
+DMAKE_URL=
+if test "$DMAKE" = "no"; then
+    AC_MSG_NOTICE([no system or user-provided dmake found])
+    # Check if a URL was supplied from which we can download the source and compile it.
+    if test -n "$with_dmake_url" ; then
+       # At this moment we can not verify the URL or the content that we want to download.
+       # Neither can we apply the test below for ruling out that it is the SunStudio dmake.
+       DMAKE_URL=$with_dmake_url
+       AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap])
+       DMAKE=
+    else
+       AC_MSG_WARN([no URL for dmake source code specified, either.])
+       BUILD_DMAKE=YES
+       AC_MSG_WARN([dmake will be built from internal sources but these will be removed in
the future"])
+    fi
+else
+    AC_MSG_CHECKING([whether the found dmake is the right dmake])
+    # we need to find out whether that dmake we found is "our" dmake
+    # or the dmake from Sun's SunStudio Compiler which is something
+    # different
+    # This test _should_ work because the one accepts -V (ours) and one
+    # (the other) not...
+    $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
+    if test $? -eq 0; then 
+       BUILD_DMAKE=NO
+       AC_MSG_RESULT([yes])
+       AC_MSG_CHECKING([the dmake version])
+       DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
+       if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
+          AC_MSG_RESULT([OK, >= 4.11])
+       elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
+	        test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
+          AC_MSG_RESULT([OK, >= 4.11])
+       else
+          AC_MSG_ERROR([too old. >= 4.11 is needed])
+          DMAKE=no
+       fi
+    else
+       AC_MSG_WARN([no])
+       DMAKE=no
+    fi
+fi
+if test "$DMAKE" = "no"; then
+   AC_MSG_ERROR([please use --with-dmake-path or --with-dmake-url to specify dmake executable
or source])
+fi
+AC_SUBST(DMAKE_URL)
+AC_SUBST(DMAKE)
+
+
+dnl ===================================================================
 dnl Search all the common names for GNU or BSD tar
 dnl ===================================================================
 AC_MSG_CHECKING([for GNU or BSD compatible tar])
@@ -3224,44 +3301,6 @@ dnl ====================================
 dnl Checks for programs.
 dnl ===================================================================
 
-dnl ===================================================================
-dnl Check whether we already have dmake
-dnl ===================================================================
-AC_PATH_PROG(DMAKE, dmake, no)
-if test "$DMAKE" = "no"; then
-    BUILD_DMAKE=YES
-    echo "dmake will be built on ./bootstrap"
-else
-    AC_MSG_CHECKING([whether the found dmake is the right dmake])
-    # we need to find out whether that dmake we found is "our" dmake
-    # or the dmake from Sun's SunStudio Compiler which is something
-    # different
-    # This test _should_ work because the one accepts -V (ours) and one
-    # (the other) not...
-    $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
-    if test $? -eq 0; then 
-       BUILD_DMAKE=NO
-       AC_MSG_RESULT([yes])
-       AC_MSG_CHECKING([the dmake version])
-       DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
-       if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-	 AC_MSG_RESULT([OK, >= 4.11])
-       elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-	    test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-	 AC_MSG_RESULT([OK, >= 4.11])
-       else
-	 AC_MSG_RESULT([too old. >= 4.11 is needed])
-	 echo "A newer dmake will be built on ./bootstrap"
-	 BUILD_DMAKE=YES
-       fi
-    else
-       AC_MSG_RESULT([no])
-       echo "dmake will be built on ./bootstrap"
-       BUILD_DMAKE=YES
-    fi
-fi
-AC_SUBST(BUILD_DMAKE)
-
 AC_MSG_CHECKING([whether to enable EPM for packing])
 if test "$enable_epm" = "yes"; then
    AC_MSG_RESULT([yes])

Modified: incubator/ooo/trunk/main/fetch_tarballs.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fetch_tarballs.sh?rev=1204412&r1=1204411&r2=1204412&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fetch_tarballs.sh (original)
+++ incubator/ooo/trunk/main/fetch_tarballs.sh Mon Nov 21 09:25:07 2011
@@ -106,9 +106,45 @@ start_dir=`pwd`
 logfile=$TARFILE_LOCATION/fetch.log
 date >> $logfile
 
-filelist=`cat $1`
+# Create and go to a temporary directory under the tar file destination.
 mkdir -p $TARFILE_LOCATION/tmp
 cd $TARFILE_LOCATION/tmp
+
+if [ -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" ]; then
+    # Determine the name of the downloaded file.
+    dmake_package_name=`echo $DMAKE_URL | sed "s/^\(.*\/\)//"`
+
+    if [ ! -f "../$dmake_package_name" ]; then
+        # Fetch the dmake source
+        if [ ! -z "$wget" ]; then
+            echo fetching $DMAKE_URL with wget to $TARFILE_LOCATION/tmp
+            $wget -nv -N $DMAKE_URL 2>&1 | tee -a $logfile
+        else
+            echo fetching $DMAKE_URL with curl to $TARFILE_LOCATION/tmp
+            $curl $file_date_check -O $DMAKE_URL 2>&1 | tee -a $logfile
+        fi
+        wret=$?
+
+        # When the download failed then remove the remains, otherwise
+        # move the downloaded file up to TARFILE_LOCATION
+        if [ $wret -ne 0 ]; then
+            echo "download failed. removing $dmake_package_name"
+            rm "$dmake_package_name"
+            failed="$failed $i"
+            wret=0
+        else
+            mv "$dmake_package_name" ..
+            echo "successfully downloaded $dmake_package_name"
+        fi
+    else
+        echo "found $dmake_package_name, no need to download it again"
+    fi
+fi
+
+
+
+cd $TARFILE_LOCATION/tmp
+filelist=`cat $1`
 echo $$ > fetch-running
 for i in $filelist ; do
 #    echo $i

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1204412&r1=1204411&r2=1204412&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Nov 21 09:25:07 2011
@@ -1973,7 +1973,7 @@ ToFile( "DISABLE_XAW",       "@DISABLE_X
 ToFile( "ENABLE_AGG",        "@ENABLE_AGG@",       "e" );
 ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
 ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );
-ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
+ToFile( "DMAKE_URL",         "@DMAKE_URL@",        "e" );
 ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );



Mime
View raw message