ooo-build r14072 - in branches/ooo-build-3-0: . bin doc patches/dev300 patches/scsolver

From: thorstenb svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14072 - in branches/ooo-build-3-0: . bin doc patches/dev300 patches/scsolver
Date: Thu, 25 Sep 2008 09:09:20 +0000 (UTC)
Author: thorstenb
Date: Thu Sep 25 09:09:20 2008
New Revision: 14072
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14072&view=rev

Log:
        * patches/dev300/apply:
        * patches/dev300/macosx-lpsolve-makefile.diff:
        Added GoOoMac flavor, removed no-longer-necessary mac patches
        * patches/scsolver/scsolver-lpsolve.diff: Mac needs .a 
        delivered as well
        * doc/AUTOGEN.NovellMacOSX.sh: the current Mac configure line
        * bin/build-ooo:
        * bin/ooinstall:
        * bin/setup.in:
        * configure.in: necessary changes for Mac build (from trunk)



Added:
   branches/ooo-build-3-0/doc/AUTOGEN.NovellMacOSX.sh
Removed:
   branches/ooo-build-3-0/patches/dev300/macosx-lpsolve-makefile.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/build-ooo
   branches/ooo-build-3-0/bin/ooinstall
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/scsolver/scsolver-lpsolve.diff

Modified: branches/ooo-build-3-0/bin/build-ooo
==============================================================================
--- branches/ooo-build-3-0/bin/build-ooo	(original)
+++ branches/ooo-build-3-0/bin/build-ooo	Thu Sep 25 09:09:20 2008
@@ -5,7 +5,7 @@
 #
 . ./setup
 
-if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS"; then
+if test "z$BUILD_WIN32" = "z" -a "z`uname -s`" != "zSunOS" -a "z`uname -s`" != "zDarwin"; then
     if ! test -f /proc/cpuinfo; then
         echo "Looks like proc isn't mounted - this means almost certain"
         echo "Java related weird build failure: please check /proc"

Modified: branches/ooo-build-3-0/bin/ooinstall
==============================================================================
--- branches/ooo-build-3-0/bin/ooinstall	(original)
+++ branches/ooo-build-3-0/bin/ooinstall	Thu Sep 25 09:09:20 2008
@@ -32,13 +32,18 @@
 }
 
 sub wanted {
+    my $path_to_unopkg="$path/program";
+    if ( $^O =~ /darwin/i )
+    {
+        $path_to_unopkg="$path/OpenOffice.org.app/Contents/MacOS";
+    }
     -f $_ 
 	&& /.*\.oxt$/
-	&& system ( "LD_LIBRARY_PATH='' $path/program/unopkg add -v --shared $File::Find::name" )
+	&& system ( "LD_LIBRARY_PATH='' $path_to_unopkg/unopkg add -v --shared $File::Find::name" )
 	&& die "Cannot install $_ extension!";
 }
 
-( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
+( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 suck_setup ("./setup") || suck_setup ("bin/setup") || die "can't find bin/setup";
 

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Thu Sep 25 09:09:20 2008
@@ -71,6 +71,12 @@
     else
         echo "Warning: $TOOLSDIR/distro-configs/CommonWin32.conf not found."
     fi
+else if test "z`uname -s`" = "zDarwin"; then
+    if test -f "$TOOLSDIR/distro-configs/CommonMac.conf" ; then
+        PLATFORM_OPTIONS="`cat $TOOLSDIR/distro-configs/CommonMac.conf | xargs`";
+    else
+        echo "Warning: $TOOLSDIR/distro-configs/CommonMac.conf not found."
+    fi
 else
     if test -f "$TOOLSDIR/distro-configs/CommonLinux.conf" ; then
         PLATFORM_OPTIONS="`cat $TOOLSDIR/distro-configs/CommonLinux.conf | xargs`";
@@ -78,6 +84,7 @@
         echo "Warning: $TOOLSDIR/distro-configs/CommonLinux.conf not found."
     fi
 fi
+fi
 
 if test "z$DISTRO" != "z" -a -f "$TOOLSDIR/distro-configs/$DISTRO.conf"; then
     CONFIGURE_OPTIONS="$COMMON_OPTIONS $PLATFORM_OPTIONS $OOO_WIDGET_FLAGS `cat $TOOLSDIR/distro-configs/$DISTRO.conf | xargs`";

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Thu Sep 25 09:09:20 2008
@@ -596,7 +596,7 @@
 AC_CHECK_HEADER(png.h, have_png=true, have_png=false)
 AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false)
 
-if test "z$with_win32" = "z"; then
+if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
     if test "z$enable_pam" != "zno" && ! $have_pam; then
 	AC_MSG_ERROR(install pam-devel)
     fi
@@ -726,13 +726,13 @@
 AC_MSG_CHECKING([for widget sets])
 OOO_WIDGET_FLAGS=
 if test "$enable_kde" != "no"; then
-   if test "z$with_win32" = "z"; then
+   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
       OOO_WIDGET_FLAGS="--enable-kde "
       widget_sets="kde"
    fi
 fi
 if test "$enable_gtk" != "no"; then
-   if test "z$with_win32" = "z"; then
+   if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
       widget_sets="gtk $widget_sets"
 
@@ -906,7 +906,11 @@
 
 
 AC_MSG_CHECKING([for GNU cp])
-GNUCP=cp
+if test "z`uname -s`" = "zDarwin"; then
+   GNUCP=gcp
+else
+   GNUCP=cp
+fi
 if test "z$with_gnu_cp" != "z"; then
     if test "z${with_gnu_cp%%/*}" = "z" ; then
 	# it's an absolute path
@@ -1338,7 +1342,9 @@
 distro-configs/Common.conf
 distro-configs/CommonLinux.conf
 distro-configs/CommonWin32.conf
+distro-configs/CommonMac.conf
 distro-configs/GoOoWin32.conf
+distro-configs/GoOoMacOSX.conf
 distro-configs/DroplineGNOME.conf
 distro-configs/DroplineGNOME64.conf
 distro-configs/Debian.conf

Added: branches/ooo-build-3-0/doc/AUTOGEN.NovellMacOSX.sh
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/doc/AUTOGEN.NovellMacOSX.sh	Thu Sep 25 09:09:20 2008
@@ -0,0 +1,2 @@
+NOCONFIGURE=indeed ./autogen.sh
+./configure --disable-dependency-tracking --with-num-cpus=2 --with-distro=GoOoMacOSX --with-lang="af ar bn-IN ca cs da de el en-GB es fi fr gu-IN he hi-IN hu it ja ko mr-IN nb nl nn pl pt-BR pt ru sk sv ta-IN xh zh-CN zh-TW zu" --with-poor-help-localizations="af ar bn-IN ca el en-GB fi gu-IN hi-IN mr-IN nb nn pt sk ta-IN xh zu" --disable-mozilla --disable-build-mozilla

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Thu Sep 25 09:09:20 2008
@@ -122,6 +122,7 @@
 GoOoWin32: NovellLikeWin32
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
+GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, CustomUserConfig, CalcSolver
 # Pardus
 Pardus2007: PardusOnly, LinuxCommon, NotDebian
 Pardus2008: PardusOnly, LinuxCommon, NotDebian, Gcc43
@@ -2035,13 +2036,6 @@
 [ MacOSXOnly ]
 SectionOwner => pluby
 
-# fix lpsolve build for OSX
-macosx-lpsolve-makefile.diff
-# fixes build with gcc-3.3; required for MacOSX build
-# it is usable only until anyone uses the disabled code => MacOSXOnly
-# we will move to gcc-4.x, so it does not make sense to push it upstream
-buildfix-boost-gcc33.diff
-
 [ PardusOnly ]
 pardus-default-ExternalMailer.diff
 pardus-clipart.diff

Modified: branches/ooo-build-3-0/patches/scsolver/scsolver-lpsolve.diff
==============================================================================
--- branches/ooo-build-3-0/patches/scsolver/scsolver-lpsolve.diff	(original)
+++ branches/ooo-build-3-0/patches/scsolver/scsolver-lpsolve.diff	Thu Sep 25 09:09:20 2008
@@ -2,14 +2,24 @@
 index 0c31972..26b75b3 100644
 --- lpsolve/makefile.mk
 +++ lpsolve/makefile.mk
-@@ -72,7 +72,9 @@ BUILD_ACTION=sh ccc.solaris
+@@ -65,14 +65,18 @@ OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
+ .ELSE
+ .IF "$(OS)"=="MACOSX"
+ BUILD_ACTION=sh ccc.osx
+-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
++OUT2LIB= \
++        $(BUILD_DIR)$/liblpsolve55.dylib \
++        $(BUILD_DIR)$/liblpsolve55.a
+ .ELSE
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
  .ELSE
  BUILD_ACTION=sh ccc
  .ENDIF
 -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
 +OUT2LIB= \
-+	$(BUILD_DIR)$/liblpsolve55.so \
-+	$(BUILD_DIR)$/liblpsolve55.a
++       $(BUILD_DIR)$/liblpsolve55.so \
++       $(BUILD_DIR)$/liblpsolve55.a
  .ENDIF
  .ENDIF
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]