[ooo-build-commit] .: 2 commits - bin/build-galleries patches/dev300

[Fridrich Strba]

 bin/build-galleries                |    5 +++--
 patches/dev300/disable-python.diff |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 25f1b50a0422020b2f11d09fdf2a3fffffa83e0f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Oct 5 10:42:01 2010 +0200

    Adapting patch to the new position of NLPSOLVER:nlpsolver

diff --git a/patches/dev300/disable-python.diff b/patches/dev300/disable-python.diff
index 12f0081..2bdbeac 100644
--- a/patches/dev300/disable-python.diff
+++ b/patches/dev300/disable-python.diff
@@ -51,8 +51,8 @@
 --- postprocess/prj/build.lst.orig	2010-01-02 17:25:56.000000000 +0100
 +++ postprocess/prj/build.lst	2010-01-02 17:26:22.000000000 +0100
 @@ -1,4 +1,4 @@
--po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
-+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries PYUNO:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
++po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries PYUNO:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
commit 32747340e7ab951ecbe15fedaee8c8a32a55bdae
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Oct 5 10:41:06 2010 +0200

    Fix for platforms where /bin/sh is not bash

diff --git a/bin/build-galleries b/bin/build-galleries
index 118259b..731b75d 100755
--- a/bin/build-galleries
+++ b/bin/build-galleries
@@ -16,9 +16,10 @@ fi
 
 # source ooenv if it exists
 if [ -f "$OOINSTDIR/program/ooenv" ] ; then
-    pushd "$OOINSTDIR/program" > /dev/null
+    OLDPLACE=`pwd`;
+    cd "$OOINSTDIR/program" > /dev/null
     . ooenv
-    popd > /dev/null
+    cd $OLDPLACE > /dev/null
 fi
 
 BUILD_OOO_GAL_FROM_OPENCLIPART=no