.gitignore | 1 bootstrap | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bootstrap.1 | 88 ---------------------------------------------------------- configure.in | 1 set_soenv.in | 17 ----------- 5 files changed, 89 insertions(+), 107 deletions(-)
New commits: commit aa09a9b77d10145ecc0dc0111c7235d869a428a8 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Oct 7 14:10:10 2011 -0500 bootstrap.1 is not usefull anymore use bootsrap directly diff --git a/.gitignore b/.gitignore index 8c0f62a..57cd362 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ /aclocal.m4 /autom4te.cache /autogen.lastrun -/bootstrap /ChangeLog /config.guess /config.log diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..1bf5068 --- /dev/null +++ b/bootstrap @@ -0,0 +1,89 @@ +#!/bin/sh + +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: diff --git a/bootstrap.1 b/bootstrap.1 deleted file mode 100755 index 933b2db..0000000 --- a/bootstrap.1 +++ /dev/null @@ -1,88 +0,0 @@ - -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: diff --git a/configure.in b/configure.in index d9d28ff..f89089c 100644 --- a/configure.in +++ b/configure.in @@ -2109,7 +2109,6 @@ if test "$cross_compiling" = "yes"; then tar cf - \ Makefile.in \ bin/repo-list.in \ - bootstrap.1 \ config.guess \ configure \ ooo.lst.in \ diff --git a/set_soenv.in b/set_soenv.in index 63223e7..310ac75 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2118,23 +2118,6 @@ Alternatively, you can install the 'new' make where ever you want and make sure EOS } -$bootfile = "bootstrap"; -open( OUT, ">$bootfile" ) || -die "Cannot open $bootfile: $!\n"; -print OUT "#!/bin/sh\n"; -close( OUT ) || print "Can't close $bootfile: $!"; -system(`cat bootstrap.1 >> bootstrap`); -system(`chmod +x bootstrap`); -# -#-------------------------------------------------------- -# Moving the bootstrap file to the build home directory. -#-------------------------------------------------------- -# -$tmp = $SRC_ROOT.$ds.$bootfile; -if (rename( $bootfile, $tmp ) ne 1) -{ `mv -f $bootfile $tmp`; -} - if ( $Warning ne "" ) { print "***** WARNINGS ISSUED *****\n"; } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits