ooo-build r14076 - in trunk: . bin distro-configs doc patches/dev300 patches/scsolver

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Sep 25 09:37:44 2008
New Revision: 14076
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14076&view=rev

Log:
        * distro-configs/CommonMac.conf.in:
        * distro-configs/GoOoMacOSX.conf.in: config files for Mac build
        * 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/setup.in: honour the mac-specific config files



Added:
   trunk/distro-configs/CommonMac.conf.in
   trunk/distro-configs/GoOoMacOSX.conf.in
   trunk/doc/AUTOGEN.NovellMacOSX.sh
Removed:
   trunk/patches/dev300/macosx-lpsolve-makefile.diff
Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/patches/dev300/apply
   trunk/patches/scsolver/scsolver-lpsolve.diff

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Thu Sep 25 09:37:44 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`";

Added: trunk/distro-configs/CommonMac.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/CommonMac.conf.in	Thu Sep 25 09:37:44 2008
@@ -0,0 +1,2 @@
+--disable-gtk
+

Added: trunk/distro-configs/GoOoMacOSX.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/GoOoMacOSX.conf.in	Thu Sep 25 09:37:44 2008
@@ -0,0 +1,8 @@
+--with-intro-bitmaps=\"$SRCDIR/openintro_go-oo.bmp\"
+--with-about-bitmaps=\"$SRCDIR/openabout_go-oo.bmp\"
+--with-vendor=\"Novell, Inc.\"
+
+--with-intro-bitmaps=\"$SRCDIR/openintro_go-oo.bmp\"
+--with-about-bitmaps=\"$SRCDIR/openabout_go-oo.bmp\"
+--with-vendor=\"Novell, Inc.\"
+--disable-gtk

Added: trunk/doc/AUTOGEN.NovellMacOSX.sh
==============================================================================
--- (empty file)
+++ trunk/doc/AUTOGEN.NovellMacOSX.sh	Thu Sep 25 09:37:44 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: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Sep 25 09:37:44 2008
@@ -122,6 +122,7 @@
 GoOoWin32: NovellLikeWin32
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
+GoOoMacOSX : MacOSX, NovellOnly, CustomUserConfig, CalcSolver
 # Pardus
 Pardus2007: PardusOnly, LinuxCommon, NotDebian
 Pardus2008: PardusOnly, LinuxCommon, NotDebian, Gcc43
@@ -2037,9 +2038,6 @@
 [ MacOSXOnly ]
 SectionOwner => pluby
 
-# fix lpsolve build for OSX
-macosx-lpsolve-makefile.diff
-
 [ PardusOnly ]
 pardus-default-ExternalMailer.diff
 pardus-clipart.diff

Modified: trunk/patches/scsolver/scsolver-lpsolve.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-lpsolve.diff	(original)
+++ trunk/patches/scsolver/scsolver-lpsolve.diff	Thu Sep 25 09:37:44 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