[ooo-build-commit] .: bin/package-ooo bin/setup.in bin/unpack configure.in download_external_sources.sh download.in Makefile.shared
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Sep 14 06:59:37 PDT 2010
Makefile.shared | 8 ++---
bin/package-ooo | 6 ----
bin/setup.in | 18 ++++++------
bin/unpack | 8 ++---
configure.in | 61 +++++++------------------------------------
download.in | 5 +--
download_external_sources.sh | 2 -
7 files changed, 31 insertions(+), 77 deletions(-)
New commits:
commit 8657b3e54ba1d2b06ca88c3762c51847cfaca070
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Tue Sep 14 14:36:51 2010 +0200
remove obsolete --with-tag configure option
* ooo-build and piece sources has the same version now; it is possible to
use --with-source-version to use another piece sources
* renamed CVSTAG variable to the more descriptive OOO_SOURCEDIRNAME
* removed some not longer used functionality (related to CVSTAG and
OOo sources)
diff --git a/Makefile.shared b/Makefile.shared
index c5f74dd..9c8229a 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -54,8 +54,8 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
- CURRTAG=$(CVSTAG); test -f $(OOBUILDDIR)/.tag && CURRTAG=`cat $(OOBUILDDIR)/.tag`; \
- chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$$CURRTAG ;
+ CURSOURCE=$(OOO_SOURCEDIRNAME); test -f $(OOBUILDDIR)/.source && CURSOURCE=`cat $(OOBUILDDIR)/.source`; \
+ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$$CURSOURCE ;
test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true
$(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR)
test -n "$(OOO_GIT_MANAGED)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true
@@ -71,8 +71,8 @@ patch.unapply:
patch.list:
@FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
- CURRTAG=$(CVSTAG); test -f $(OOBUILDDIR)/.tag && CURRTAG=`cat $(OOBUILDDIR)/.tag`; \
- chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --dry-run --quiet --tag=$$CURRTAG
+ CURSOURCE=$(OOO_SOURCEDIRNAME); test -f $(OOBUILDDIR)/.source && CURSOURCE=`cat $(OOBUILDDIR)/.source`; \
+ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --dry-run --quiet --tag=$$CURSOURCE
refresh: $(STAMP_DIR)/refresh
$(STAMP_DIR)/refresh : $(CLONEDIR)/repos_changed
diff --git a/bin/package-ooo b/bin/package-ooo
index cd3f428..2f8f4c2 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -372,11 +372,7 @@ if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program
echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt
echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME/program" >>$BUILDDIR/upstream_branding_list.txt
- if test "$CVSTAG" = "ooo320-m12" ; then
- branding_stuff="about.bmp intro.bmp"
- else
- branding_stuff="about.png intro.png intro.bmp sofficerc"
- fi
+ branding_stuff="about.png intro.png intro.bmp sofficerc"
for file in $branding_stuff ; do
mv $OOINSTDIR/program/$file $DATADIR/$OOOINSTALLDIRNAME/program/$file
ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/program/$file $OOINSTDIR/program/$file
diff --git a/bin/setup.in b/bin/setup.in
index a607853..367d895 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -14,11 +14,11 @@ BINSUFFIX='@OOO_BINSUFFIX@'
OOO_LANGS='@OOO_LANGS@'
if test "$OOO_LANGS" = ""; then OOO_LANGS="en-US"; fi
OOO_POOR_HELP_LOCALIZATIONS='@OOO_POOR_HELP_LOCALIZATIONS@'
-CVSTAG='@CVSTAG@'
OOO_GIT='@OOO_GIT@'
+OOO_SOURCEDIRNAME='@OOO_SOURCEDIRNAME@'
CLONEDIR='@CLONEDIR@'
RAWBUILDDIR='@RAWBUILDDIR@'
-GITTAG="ooo/`echo @CVSTAG@ | tr '[[:lower:]]-' '[[:upper:]]_' | sed 's/_M/_m/'`"
+GITTAG="ooo/`echo $OOO_SOURCEDIRNAME | tr '[[:lower:]]-' '[[:upper:]]_'`"
APPLY_DIR='@APPLY_DIR@'
BUILD_NCPUS='@BUILD_NCPUS@'
ENABLE_CCACHE='@ENABLE_CCACHE@'
@@ -292,11 +292,11 @@ if test -n "$UPSTREAM_NAME" ; then
OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2"
OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2"
else
- OOO_TARBALL="$CVSTAG-core.tar.bz2"
- OOO_SYSTEM_TARBALL="$CVSTAG-system.tar.bz2"
- OOO_BINFILTER_TARBALL="$CVSTAG-binfilter.tar.bz2"
- OOO_LANG_TARBALL="$CVSTAG-lang.tar.bz2"
- OOO_EXTENSIONS_TARBALL="${CVSTAG}-extensions.tar.bz2"
+ OOO_TARBALL="$OOO_SOURCEDIRNAME-core.tar.bz2"
+ OOO_SYSTEM_TARBALL="$OOO_SOURCEDIRNAME-system.tar.bz2"
+ OOO_BINFILTER_TARBALL="$OOO_SOURCEDIRNAME-binfilter.tar.bz2"
+ OOO_LANG_TARBALL="$OOO_SOURCEDIRNAME-lang.tar.bz2"
+ OOO_EXTENSIONS_TARBALL="$OOO_SOURCEDIRNAME-extensions.tar.bz2"
fi
OOO_SPLIT_PREFIX=""
if test "z at SPLIT@" = "zyes"; then
@@ -324,7 +324,7 @@ OPENCLIPART_DIR=@OPENCLIPART_DIR@
MDBTOOLS_SRC=@MDBTOOLS_SRC@
SYSTEM_MDBTOOLS=@SYSTEM_MDBTOOLS@
-export LD_LIBRARY_PATH PATH CVSTAG APPLY_DIR
+export LD_LIBRARY_PATH PATH OOO_SOURCEDIRNAME APPLY_DIR
export CCACHE_DIR CCACHE_NOLINK CCACHE_UNIFY
export SRCDIR BUILDDIR OOBUILDDIR GITTAG
export BUILD_FLAGS VERSION TOOLSDIR VENDORNAME
@@ -345,7 +345,7 @@ export RPM_TAG_LANGPACKS
fi
echo "Setup:"
-echo " Tag: '$CVSTAG'"
+echo " Source: '$OOO_SOURCEDIRNAME'"
echo " Apply: '$APPLY_DIR/apply'"
echo " Flags: '$BUILD_FLAGS'"
echo " Suffix: '$BINSUFFIX'"
diff --git a/bin/unpack b/bin/unpack
index 30401d9..6a582df 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -274,7 +274,7 @@ if test "z$OOO_GIT" = "z" ; then
if test "$SOURCE_TYPE" = "CGIT" ; then
ln -s "$BUILDDIR/$GITTAG" $OOBUILDDIR
else
- ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR
+ ln -s "$BUILDDIR/$OOO_SOURCEDIRNAME-$PIECE" $OOBUILDDIR
fi
# ugly hack around odd positioning of this info
echo "Unpacking setup_native .txt pieces"
@@ -335,11 +335,11 @@ if test "z$SPLIT" != "zyes"; then
fi
if test "$ENABLE_CCACHE" = "yes" ; then
- if test "$BUILDDIR/$CVSTAG" != "$OOBUILDDIR" ; then
- mv "$BUILDDIR/$CVSTAG" "$OOBUILDDIR"
+ if test "$BUILDDIR/$OOO_SOURCEDIRNAME" != "$OOBUILDDIR" ; then
+ mv "$BUILDDIR/$OOO_SOURCEDIRNAME" "$OOBUILDDIR"
fi
fi
-echo "$CVSTAG" > "$OOBUILDDIR/.tag"
+echo "$OOO_SOURCEDIRNAME" > "$OOBUILDDIR/.source"
echo "Fixing unfortunate snafus"
cd $BUILDDIR
diff --git a/configure.in b/configure.in
index 67c12bd..47fab0a 100644
--- a/configure.in
+++ b/configure.in
@@ -18,14 +18,6 @@ AC_SUBST(OOO_BUILDVERSION)
PROPAGATED_ARGS=$ac_configure_args
AC_SUBST(PROPAGATED_ARGS)
-AC_ARG_WITH(tag,
-[
- --with-tag define the tag to use ooo sources from the
- ooo-build git repos
-
- Example: --with-tag=ooo-build-3.3.0.1],
-,)
-
AC_ARG_WITH(source-version,
[
--with-source-version define another version for the ooo source tarballs
@@ -553,21 +545,13 @@ AC_SUBST(BUILD_WIN32)
AM_CONDITIONAL(BUILD_WIN32, [test "$BUILD_WIN32" = yes])
-if test "z$with_tag" = "z"; then
- with_tag=ooo-build-$OOO_BUILDVERSION
-fi
-
if test "z`uname -s`" = "zSunOS" -a -f /usr/xpg4/bin/grep ; then
GREP=/usr/xpg4/bin/grep
else
GREP=grep
fi
-if echo "$with_tag" | $GREP -E ['^(ooo-build-3.|dev300|ooo320|OOO320|ooo330|OOO330)'] >/dev/null 2>/dev/null ; then
- APPLY_DIR="$TOOLSDIR/patches/dev300"
-else
- APPLY_DIR="$TOOLSDIR/patches/$with_tag"
-fi
+APPLY_DIR="$TOOLSDIR/patches/dev300"
# search more dirs for the apply file
# the default dir is defined by the selected tag
@@ -578,12 +562,10 @@ while test "$APPLY_DIR" != "$TOOLSDIR/patches/" ; do
done
test "$APPLY_DIR" = "$TOOLSDIR/patches/" && APPLY_DIR="$TOOLSDIR/patches"
if test -f $APPLY_DIR/apply; then
- AC_MSG_RESULT([found $with_tag, using $APPLY_DIR/apply])
+ AC_MSG_RESULT([using $APPLY_DIR/apply])
else
- AC_MSG_ERROR([Can't locate patch set for: $with_tag])
+ AC_MSG_ERROR([Can't locate patch set])
fi
-CVSTAG=$with_tag
-AC_SUBST(CVSTAG)
AC_SUBST(APPLY_DIR)
# piece source version
@@ -595,10 +577,9 @@ else
fi
AC_SUBST(OOO_SOURCEVERSION)
-AC_MSG_CHECKING( for master workspace name )
-MWS=`echo ${CVSTAG%[[-_]]*} | tr [[:lower:]] [[:upper:]]`
-AC_MSG_RESULT([$MWS])
-AC_SUBST(MWS)
+# source dir name
+OOO_SOURCEDIRNAME=ooo-build-$OOO_SOURCEVERSION
+AC_SUBST(OOO_SOURCEDIRNAME)
AC_MSG_CHECKING([for split sources])
if test "$with_split" = "no" ; then
@@ -628,7 +609,7 @@ AC_MSG_RESULT([$SRCDIR])
BUILDDIR=$BASEDIR/build
if test "z$with_ooo_builddir" = "z"; then
- OOBUILDDIR=$BUILDDIR/$CVSTAG
+ OOBUILDDIR=$BUILDDIR/$OOO_SOURCEDIRNAME
else
OOBUILDDIR=$with_ooo_builddir
fi
@@ -1631,29 +1612,10 @@ AC_SUBST(OOO_GIT_MANAGED)
SOURCE_TYPE="DOWNLOAD"
+# FIXME: build with upstream sources is not longer supported; patches do not apply any longer by definition => we should clean up configure/download/unpack
+UPSTREAM_VERSION=
UPSTREAM_NAME=
UPSTREAM_URI=
-if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
- UPSTREAM_VERSION=2.3.0
-elif test "$with_tag" = "OOG680_m9" ; then
- UPSTREAM_VERSION=2.3.1
-elif test "$with_tag" = "OOH680_m12" ; then
- UPSTREAM_VERSION=2.4.0
-elif test "$with_tag" = "BEB300_m3" ; then
- UPSTREAM_VERSION=3.0.0beta2
-elif test "$with_tag" = "OOO300_m9" ; then
- UPSTREAM_VERSION=3.0.0
-elif test "$with_tag" = "OOO300_m15" ; then
- UPSTREAM_VERSION=3.0.1
-elif test "$with_tag" = "OOO310_m11" ; then
- UPSTREAM_VERSION=3.1.0
-elif test "$with_tag" = "OOO310_m18" ; then
- UPSTREAM_VERSION=3.1.1
-elif test "$with_tag" = "OOO320_m8" ; then
- UPSTREAM_VERSION=3.2.0
-elif test "$with_tag" = "OOO320_m17" ; then
- UPSTREAM_VERSION=3.2.1
-fi
if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
@@ -1665,9 +1627,6 @@ if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_URI="http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&version=${UPSTREAM_VERSION}"
fi
fi
-if test "$with_tag" = "dev300-m77" -o "$with_tag" = "dev300-m83" -o "$with_tag" = "dev300-m84"; then
- SOURCE_TYPE="DOWNLOAD"
-fi
AC_SUBST(UPSTREAM_NAME)
AC_SUBST(UPSTREAM_URI)
AC_SUBST(SOURCE_TYPE)
@@ -1849,7 +1808,7 @@ fi
echo "
Building openoffice
- tag: $CVSTAG
+ source: $OOO_SOURCEDIRNAME
apply rules: $APPLY_DIR/apply
build dir: $OOBUILDDIR
tools dir: $TOOLSDIR
diff --git a/download.in b/download.in
index 2d1e035..30abf38 100755
--- a/download.in
+++ b/download.in
@@ -266,7 +266,6 @@ sub source_file_ooo($)
}
}
- my $tag = '@CVSTAG@';
if ( '@OOO_GIT@' ne "" ) {
if ( -d "@CLONEDIR@/$what" ) {
print "* repo already there, skipping " . '@OOO_GIT@' . "/$what (make sure to bin/g pull -r)\n";
@@ -299,7 +298,7 @@ sub source_file_ooo($)
source_file( '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
}
elsif ( '@SOURCE_TYPE@' eq "CGIT" ) {
- my $git_tag = $tag;
+ my $git_tag = '@OOO_SOURCEDIRNAME@';
$git_tag =~ tr/a-z/A-Z/;
$git_tag =~ s/-/_/g;
$git_tag =~ s/\./_/g;
@@ -396,7 +395,7 @@ while ($arg = shift @ARGV) {
}
# Defaults
-print "Downloading files for @CVSTAG@\n";
+print "Downloading files for @OOO_SOURCEDIRNAME@\n";
-x $WGET || die "Can't find wget - install it and try again\n";
diff --git a/download_external_sources.sh b/download_external_sources.sh
index 2f62e0f..ec2654b 100755
--- a/download_external_sources.sh
+++ b/download_external_sources.sh
@@ -3,7 +3,7 @@
. ./bin/setup
export TARFILE_LOCATION
-GIT_TAG=`echo $CVSTAG | tr "a-z.-" "A-Z__"`
+GIT_TAG=`echo $OOO_SOURCEDIRNAME | tr "a-z.-" "A-Z__"`
tmp=`mktemp -q -d`
cd $tmp
More information about the ooo-build-commit
mailing list