Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

1 files changed, 88 insertions, 0 deletions

diff --git a/bootstrap.1 b/bootstrap.1
new file mode 100755
index 000000000000..933b2db7e71c
--- /dev/null
+++ b/bootstrap.1
@@ -0,0 +1,88 @@
+
+if test -z "${SOLARENV}"; then
+    if test -f ./Env.Build.sh ; then
+        . ./Env.Build.sh
+    else
+        if test -f ./Env.Host.sh ; then
+            . ./Env.Host.sh
+        fi
+    fi
+fi
+if test -z "${SOLARENV}"; then
+    echo "bootstrap: No environment set!"
+    exit 1
+fi
+
+# remove aliases set by Env.Host.sh
+unalias mkout    2> /dev/null
+unalias deliver  2> /dev/null
+unalias build    2> /dev/null
+unalias zipdep   2> /dev/null
+
+# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
+# Use spawn instead of fork when building dmake on cygwin.
+if test "$GUI_FOR_BUILD" = "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 "$SRC_ROOT/dmake/dmake$EXEEXT"; then
+        cd "$SRC_ROOT/dmake" || exit
+
+        # If cross-compiling then don't use the cross compilers to build dmake.
+        if test "$GUI_FOR_BUILD" = "WNT"; then
+            # Let the Cygwin gcc be found
+            unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+        elif test "$CROSS_COMPILING" = "YES"; then
+            export CC="$CC_FOR_BUILD"
+            export CXX="$CXX_FOR_BUILD"
+            unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
+        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 "dmake/dmake already built"
+    fi
+fi
+
+mkdir -p "$SOLARENV/$OUTPATH_FOR_BUILD/bin"
+if test "$BUILD_DMAKE" != "NO"; then
+    cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH_FOR_BUILD/bin" || exit
+    echo ""
+    echo "dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT"
+fi
+
+#make sure build.pl is executable
+
+chmod +x "$SRC_ROOT/solenv/bin/build.pl"
+chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
+chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
+
+# Local Variables:
+# mode: shell-script
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: