incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1206110 - in /incubator/ooo/trunk/main: configure.in epm/makefile.mk fetch_tarballs.sh ooo.lst set_soenv.in
Date Fri, 25 Nov 2011 10:09:02 GMT
Author: jsc
Date: Fri Nov 25 10:09:01 2011
New Revision: 1206110

URL: http://svn.apache.org/viewvc?rev=1206110&view=rev
Log:
118605: remove epm, use system or specified epm (--with-epm) or build explicitly (--with-epm-url)

Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/epm/makefile.mk
    incubator/ooo/trunk/main/fetch_tarballs.sh
    incubator/ooo/trunk/main/ooo.lst
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1206110&r1=1206109&r2=1206110&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Nov 25 10:09:01 2011
@@ -118,6 +118,12 @@ AC_ARG_WITH(epm,
 			  either this is not there or you say =internal
 			  epm will be built.
 ],,)
+AC_ARG_WITH(epm-url,
+[  --with-epm-url=<URL>    Specify the location of downloadable epm 3.7 source code.
For example:
+                          http://ftp.easysw.com/pub/epm/3.7/epm-3.7-source.tar.gz
+                          Note that epm is under GPL license.],
+[  EPM_URL="$withval"
+])
 AC_ARG_WITH(package-format,
 [  --with-package-format   specify package format(s) for OOo installsets.
                           Default is "normal" one of the OS/Distribution.
@@ -1268,8 +1274,6 @@ if test "$enable_copyleft" != "yes"; the
 
    DISABLE_SAXON="TRUE"
 
-   BUILD_EPM="NO"
-
    AC_MSG_RESULT([yes])
 
 else
@@ -1280,7 +1284,6 @@ else
 
 fi
 AC_SUBST(DISABLE_SAXON)
-AC_SUBST(BUILD_EPM)
 
 
 AC_MSG_CHECKING([whether to enable native CUPS support])
@@ -3327,41 +3330,48 @@ if test "$enable_epm" = "yes"; then
       else
          AC_PATH_PROG(EPM, epm, no)
       fi
-      if test "$EPM" = "no" || test "$EPM" = "internal"; then
+
+      if test "$EPM" = "no" && test -n "$with_epm_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.
+       	 EPM_URL=$with_epm_url
+       	 AC_MSG_RESULT([epm will be downloaded and compiled in bootstrap])
+       	 EPM=
          echo "EPM will be built."
          BUILD_EPM=YES
          BUILD_TYPE="$BUILD_TYPE EPM"
       else
-         # Gentoo has some epm which is something different...
-         AC_MSG_CHECKING([whether the found epm is the right epm])
-         if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-            AC_MSG_RESULT([yes])
-         else
-            AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify
the path to the right epm])
-         fi
-         AC_MSG_CHECKING([epm version])
-         EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
-	 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
-	       test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.'
-f2`" -ge "7"; then
-           AC_MSG_RESULT([OK, >= 3.7])
-           BUILD_EPM=NO
-	        if test "$_os" = "Darwin"; then
-               AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
-        	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
-        	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker";
then
-          		      AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your
epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)
or use internal patched epm (--with-epm=internal)])
-        	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker";
then
-          		    AC_MSG_RESULT([$_pm, ok])
-        	      else # we never should get here, but go safe
-			          AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your
epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)
or use internal patched epm (--with-epm=internal)])
-		          fi
-	       fi
+         if test "$EPM" = "no" ; then
+	    AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the
path to the right epm (--with-epm). Or specify an Url to an epm-3.7 source package (--with-epm-url)])
 	 else
-           AC_MSG_RESULT([too old. epm >= 3.7 is required.])
-           echo "EPM will be built."
-           BUILD_EPM=YES
-           BUILD_TYPE="$BUILD_TYPE EPM"
-	 fi
+	    # Gentoo has some epm which is something different...
+            AC_MSG_CHECKING([whether the found epm is the right epm])
+            if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
+               AC_MSG_RESULT([yes])
+            else
+	       AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify
the path to the right epm])
+            fi
+            AC_MSG_CHECKING([epm version])
+            EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
+	    if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
+	       	    test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION |
cut -d'.' -f2`" -ge "7"; then
+               AC_MSG_RESULT([OK, >= 3.7])
+               BUILD_EPM=NO
+	       if test "$_os" = "Darwin"; then
+                  AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
+        	  _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
+        	  if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker";
then
+          	     AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your
epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
+        	  elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker";
then
+          	     AC_MSG_RESULT([$_pm, ok])
+        	  else # we never should get here, but go safe
+		     AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with
the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
+		  fi
+	       fi
+	    else
+               AC_MSG_ERROR([too old. epm >= 3.7 is required.])
+	    fi
+      	 fi
       fi
    fi
 
@@ -3508,15 +3518,17 @@ msi - Windows .msi
          AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
       fi
    fi
-   AC_SUBST(BUILD_EPM)
    AC_SUBST(RPM)
    AC_SUBST(DPKG)
    AC_SUBST(PKGMK)
 else
    AC_MSG_RESULT([no])
+   BUILD_EPM=NO
    EPM=NO
    PKGFORMAT=native
 fi
+AC_SUBST(BUILD_EPM)
+AC_SUBST(EPM_URL)
 AC_SUBST(EPM)
 AC_SUBST(PKGFORMAT)
 

Modified: incubator/ooo/trunk/main/epm/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/epm/makefile.mk?rev=1206110&r1=1206109&r2=1206110&view=diff
==============================================================================
--- incubator/ooo/trunk/main/epm/makefile.mk (original)
+++ incubator/ooo/trunk/main/epm/makefile.mk Fri Nov 25 10:09:01 2011
@@ -34,14 +34,21 @@ TARGET=epm
 
 .INCLUDE :	settings.mk
 
+.IF "$(BUILD_EPM)" == "NO"
+
+@all:
+    @echo "epm disabled or system epm used ...."
+
+.ELSE
+
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)"=="UNX"
+
 TARFILE_NAME=epm-3.7
 TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4
 PATCH_FILES=epm-3.7.patch
 
-.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
-
 CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--disable-fltk
 .IF "$(OS)"=="MACOSX"
@@ -54,6 +61,8 @@ OUT2BIN=epm epminstall mkepmlist
 
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk

Modified: incubator/ooo/trunk/main/fetch_tarballs.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fetch_tarballs.sh?rev=1206110&r1=1206109&r2=1206110&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fetch_tarballs.sh (original)
+++ incubator/ooo/trunk/main/fetch_tarballs.sh Fri Nov 25 10:09:01 2011
@@ -142,6 +142,49 @@ if [ -n "$DMAKE_URL" -a ! -x "$SOLARENV/
 fi
 
 
+#Special handling of epm
+if [ -n "$EPM_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/epm$EXEEXT" ]; then
+    # Determine the name of the downloaded file.
+    epm_package_name=`echo $EPM_URL | sed "s/^\(.*\/\)//"`
+    epm_package=`echo $epm_package_name | sed "s/-source//"`
+    epm_wildcard_package_name="*-$epm_package"
+
+    # check with wildcard for the renamed package, md5 
+    if [ ! -f "../$epm_wildcard_package_name" ]; then
+        # Fetch the epm source
+        if [ ! -z "$wget" ]; then
+            echo fetching $EPM_URL with wget to $TARFILE_LOCATION/tmp
+            $wget -nv -N $EPM_URL 2>&1 | tee -a $logfile
+        else
+            echo fetching $EPM_URL with curl to $TARFILE_LOCATION/tmp
+            $curl $file_date_check -O $EPM_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 and rename it
+	# according our naing convention for external tar balls.
+        if [ $wret -ne 0 ]; then
+            echo "download failed. removing $epm_package_name"
+            rm "$epm_package_name"
+            failed="$failed $i"
+            wret=0
+        else
+            #mv "$epm_package_name" ..
+	    epm_md5_sum=`$md5sum $md5special $epm_package_name | sed "s/ .*//"`
+	    epm_md5_package_name="$epm_md5_sum-$epm_package"
+	    
+	    rm -f ../$epm_md5_package_name && \
+		cp -pRP $epm_package_name ../$epm_md5_package_name && \
+		rm -rf $epm_package_name
+            echo "successfully downloaded $epm_package_name and renamed to $epm_md5_package_name"
+        fi
+    else
+        echo "found $epm_package_name, no need to download it again"
+    fi
+fi 
+# end special 
+
 
 cd $TARFILE_LOCATION/tmp
 filelist=`cat $1`

Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1206110&r1=1206109&r2=1206110&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Fri Nov 25 10:09:01 2011
@@ -17,7 +17,6 @@ http://hg.services.openoffice.org/binari
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
-3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1206110&r1=1206109&r2=1206110&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Fri Nov 25 10:09:01 2011
@@ -1881,6 +1881,7 @@ if ( '@ENABLE_RPATH@' eq "no" ) {
   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
 }
 ToFile( "EPM",               "@EPM@",              "e" );
+ToFile( "EPM_URL",           "@EPM_URL@",	   "e" );
 ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
 ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );



Mime
View raw message