[Libreoffice-commits] .: Branch 'libreoffice-3-4' - bin/install-artwork bin/Makefile.am bin/piece bin/unpack configure.in Makefile.am
René Engelhard
rene at kemper.freedesktop.org
Tue May 31 04:49:42 PDT 2011
Makefile.am | 12 --------
bin/Makefile.am | 1
bin/install-artwork | 70 ------------------------------------------------
bin/piece/unpack-extras | 8 -----
bin/unpack | 2 -
configure.in | 3 --
6 files changed, 2 insertions(+), 94 deletions(-)
New commits:
commit 62d03af388e1cd76a487f3e44b700d77f48396bb
Author: Rene Engelhard <rene at debian.org>
Date: Tue May 31 01:23:39 2011 +0200
remove obsolete install-artwork and unpack-extras
diff --git a/Makefile.am b/Makefile.am
index d06f3f3..226f56e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,16 +43,7 @@ $(OOBUILDDIR)/unpack : $(top_srcdir)/bin/unpack
fi
cd $(top_srcdir)/bin ; ./unpack
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true
- rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \
- $(STAMP_DIR)/artwork.install
- touch $@
-
-artwork.install : $(STAMP_DIR)/artwork.install
-$(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
- $(STAMP_DIR)/prebuild \
- $(wildcard $(top_srcdir)/src/*.png) \
- $(wildcard $(top_srcdir)/src/*.bmp)
- $(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR)
+ rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply
touch $@
patch.apply: $(STAMP_DIR)/patch.apply
@@ -130,7 +121,6 @@ build.prepare : $(STAMP_DIR)/build_prepared
$(STAMP_DIR)/build_prepared : $(OOBUILDDIR)/unpack \
$(STAMP_DIR)/refresh \
$(STAMP_DIR)/patch.apply \
- $(STAMP_DIR)/artwork.install \
$(STAMP_DIR)/build.tools \
$(STAMP_DIR)/prebuild
touch $@
diff --git a/bin/Makefile.am b/bin/Makefile.am
old mode 100644
new mode 100755
index 628b964..ce1a808
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -16,7 +16,6 @@ script_files = \
install-dictionaries \
install-mono \
install-sdk \
- install-artwork \
java-set-classpath.in \
localize-ooo \
make-win32-iso \
diff --git a/bin/install-artwork b/bin/install-artwork
deleted file mode 100755
index 7a0630c..0000000
--- a/bin/install-artwork
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-. `dirname $0`/setup
-
-# installs artwork, opportunistically from src to dest
-
-src=$1
-dest=$2
-
-echo "do artwork tweaks ..."
-
-if test -d $dest/setup_native; then
- mkdir -p $dest/setup_native/source/win32/nsis
- cp $src/ooobitmap_*.bmp $dest/setup_native/source/win32/nsis/ || echo "no nsis installer images to copy"
- cp $src/ooobanner_*.bmp $dest/setup_native/source/win32/nsis/ || echo "no nsis banner images to copy"
- cp $src/ooosetup_*.ico $dest/setup_native/source/win32/nsis/ || echo "no installer icon to copy"
-else
- echo " skipping setup_native"
-fi
-
-if test -d $dest/instsetoo_native; then
- mkdir -p $dest/instsetoo_native/res
- cp $src/nologoinstall_*.bmp $dest/instsetoo_native/res/ || echo "no installer sidebar images to copy"
- cp $src/banner_*.bmp $dest/instsetoo_native/res/ || echo "no installer banner images to copy"
-else
- echo " skipping instsetoo_native"
-fi
-
-if test -d $dest/svx; then
- mkdir -p $dest/svx/res
- cp $src/open*_*.bmp $dest/svx/res/ || echo "no intro images to copy"
-else
- echo " skipping svx"
-fi
-
-if test -d $dest/default_images; then
- mkdir -p $dest/default_images/svx/res
- mkdir -p $dest/default_images/sw/res
- cp $src/open*_*.png $dest/default_images/svx/res/ || echo "no about images to copy"
- cp $src/*-team.png $dest/default_images/sw/res/ || echo "no team images to copy"
-
- mkdir -p $dest/default_images/res/commandimagelist
- mkdir -p $dest/ooo_custom_images/industrial/res/commandimagelist
- mkdir -p $dest/ooo_custom_images/tango/res/commandimagelist
- cp $src/layout/*.png $dest/default_images/res/commandimagelist
- cp $src/layout/*.png $dest/ooo_custom_images/industrial/res/commandimagelist
- cp $src/layout/*.png $dest/ooo_custom_images/tango/res/commandimagelist
- ${GNUTAR} -C $src/layout --exclude=.svn -cf- default_images ooo_custom_images | ${GNUTAR} -C $dest -xf-
-
- # Extra command images
- cp -f $src/icons/*.png $dest/default_images/res/commandimagelist/ || exit 1
- cp -f $src/icons/tango/*.png $dest/ooo_custom_images/tango/res/commandimagelist/ || exit 1
-
- # Tango icon for the GNOME quickstarter applet..."
- cp -f $src/tango_mainapp_16.png $dest/ooo_custom_images/tango/res/mainapp_16.png || exit 1;
-
- # Copy extra ooo-build specific images into build. All files under default_images
- # are copied into the build recursively.
- (cd $src && {
- for img in `find default_images -type f`; do
- test $? -eq 0 || exit 1
- # TODO: maybe we should check if the file is really an image file ?
- imgdir=`dirname $img` || exit 1
- mkdir -p $dest/$imgdir || exit 1
- cp -f $img $dest/$img || exit 1
- done
- })
-else
- echo " skipping default_images"
-fi
diff --git a/bin/piece/unpack-extras b/bin/piece/unpack-extras
deleted file mode 100755
index ed8dd43..0000000
--- a/bin/piece/unpack-extras
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-TOOLSDIR=$1
-OOBUILDDIR=$2
-
-echo "Copying custom user-dicts into tree"
-[ -d $OOBUILDDIR/extras/source/wordbook ] || mkdir -p $OOBUILDDIR/extras/source/wordbook
-cp -f $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
diff --git a/bin/unpack b/bin/unpack
index 30073cd..6be8437 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -743,8 +743,6 @@ if test "x$GRAPHITE_SRC" != "x"; then
cp $SRCDIR/$GRAPHITE_SRC $GRAPHITE_DEST || exit 1;
fi
-$TOOLSDIR/bin/piece/unpack-extras $TOOLSDIR $OOBUILDDIR || exit 1;
-
echo "Installing bibliography overwrides";
$GNUTAR xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
diff --git a/configure.in b/configure.in
index 4f8b4c6..38a8ab3 100755
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(libreoffice-build, 3.3.99.1)
+AC_INIT(libreoffice-build, 3.4.0.2)
AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
@@ -1873,7 +1873,6 @@ patches/64bit/Makefile
po/Makefile
po/sdf-templates/Makefile
doc/Makefile
-src/Makefile
src/helpcontent2/Makefile
src/icons/Makefile
src/icons/tango/Makefile
More information about the Libreoffice-commits
mailing list