[ooo-build-commit] .: 2 commits - bin/setup.in configure.in download_external_sources.sh patches/dev300

Fri Sep 10 12:12:47 PDT 2010

bin/setup.in                        |    3 +--
 configure.in                        |   18 ------------------
 download_external_sources.sh        |    7 +++----
 patches/dev300/piece-scripting.diff |   14 ++++++++------
 4 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit 6850911a72eb3026802dc3fd30f392931bcfe259
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Sep 10 21:12:05 2010 +0200

    Cleaned up piece-scripting.diff to apply in openSUSE Factory

diff --git a/patches/dev300/piece-scripting.diff b/patches/dev300/piece-scripting.diff
index 32d4b4e..a7037f3 100644
--- a/patches/dev300/piece-scripting.diff
+++ b/patches/dev300/piece-scripting.diff
@@ -1,6 +1,6 @@
---- scripting/source/dlgprov/makefile.mk.old	2010-03-23 14:25:13.000000000 +0100
-+++ scripting/source/dlgprov/makefile.mk	2010-03-23 15:10:03.000000000 +0100
-@@ -77,6 +77,7 @@ ALLTAR : \
+--- scripting/source/vbaevents/makefile.mk.old	2010-09-10 19:14:19.000000000 +0200
++++ scripting/source/vbaevents/makefile.mk	2010-09-10 21:05:42.000000000 +0200
+@@ -87,7 +87,8 @@ ALLTAR : \
  
  $(SLOFILES) : $(MISC)$/$(TARGET).don
  
@@ -10,9 +10,10 @@
 +$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
 +        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
---- scripting/source/vbaevents/makefile.mk.old	2010-03-23 13:43:40.000000000 +0100
-+++ scripting/source/vbaevents/makefile.mk	2010-03-23 14:06:33.000000000 +0100
-@@ -57,6 +57,7 @@ ALLTAR : \
+  
+--- scripting/source/dlgprov/makefile.mk.old	2010-09-01 18:26:16.000000000 +0200
++++ scripting/source/dlgprov/makefile.mk	2010-09-10 21:05:42.000000000 +0200
+@@ -76,7 +76,8 @@ ALLTAR : \
  
  $(SLOFILES) : $(MISC)$/$(TARGET).don
  
@@ -22,3 +23,4 @@
 +$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
 +        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
+  
commit ec0dc960d009dfec736b7d1e1477d7d532c5bced
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Sep 10 20:57:44 2010 +0200

    get rid of --with-ooo-tag configure option
    
    Get fetch_tarballs.sh from "cgit" rather than from "hg"; the the configure
    option --with-ooo-tag is not longer needed

diff --git a/bin/setup.in b/bin/setup.in
index fd59b6d..7c98629 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -15,7 +15,6 @@ 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_TAG='@OOO_TAG@'
 OOO_GIT='@OOO_GIT@'
 CLONEDIR='@CLONEDIR@'
 RAWBUILDDIR='@RAWBUILDDIR@'
@@ -326,7 +325,7 @@ OPENCLIPART_DIR=@OPENCLIPART_DIR@
 MDBTOOLS_SRC=@MDBTOOLS_SRC@
 SYSTEM_MDBTOOLS=@SYSTEM_MDBTOOLS@
 
-export LD_LIBRARY_PATH PATH CVSTAG OOO_TAG APPLY_DIR
+export LD_LIBRARY_PATH PATH CVSTAG APPLY_DIR
 export CCACHE_DIR CCACHE_NOLINK CCACHE_UNIFY
 export SRCDIR BUILDDIR OOBUILDDIR GITTAG
 export BUILD_FLAGS VERSION TOOLSDIR VENDORNAME
diff --git a/configure.in b/configure.in
index e81a8cb..3effdad 100644
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,6 @@ AC_PREFIX_DEFAULT(/usr)
 
 # ooo-build tag needed to get OOo sources from ooo-build git
 DEFAULT_TAG=ooo-build-3.2.98.0
-# ooo tag to get external sources from http://hg.services.openoffice.org
-DEFAULT_OOO_TAG=ooo330-m7
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO320_m1
 
@@ -33,14 +31,6 @@ AC_ARG_WITH(tag,
                           Example:  --with-tag=ooo-build-3.3.0.1],
 ,)
 
-AC_ARG_WITH(ooo-tag,
-[
-  --with-ooo-tag          define the tag to download external sources from
-                          http://hg.services.openoffice.org
-
-                          Example:  --with-tag=dev300-mXYZ],
-,)
-
 AC_ARG_WITH(source-version,
 [
   --with-source-version   define another version for the ooo source tarballs
@@ -601,14 +591,6 @@ CVSTAG=$with_tag
 AC_SUBST(CVSTAG)
 AC_SUBST(APPLY_DIR)
 
-# tag for the external sources from http://hg.services.openoffice.org
-if test "z$with_ooo_tag" = "z"; then
-   OOO_TAG="$DEFAULT_OOO_TAG"
-else
-   OOO_TAG="$with_ooo_tag"
-fi
-AC_SUBST(OOO_TAG)
-
 # piece source version
 if test "z$with_source_version" = "z"; then
    # FIXME: do we want to guess it from the tag, e.g. 3.3.0.1 from OOO_BUILD_3_3_0_1?
diff --git a/download_external_sources.sh b/download_external_sources.sh
index f32bc53..2f62e0f 100755
--- a/download_external_sources.sh
+++ b/download_external_sources.sh
@@ -3,13 +3,12 @@
 . ./bin/setup
 
 export TARFILE_LOCATION
-TAG=`echo $OOO_TAG | tr a-z A-Z | sed -e s/-M/_m/`
-MWS=`echo $TAG | cut -d_ -f1`
+GIT_TAG=`echo $CVSTAG | tr "a-z.-" "A-Z__"`
 tmp=`mktemp -q -d`
 
 cd $tmp
-wget http://hg.services.openoffice.org/${MWS}/raw-file/${TAG}/fetch_tarballs.sh && chmod 755 ./fetch_tarballs.sh
-wget http://hg.services.openoffice.org/${MWS}/raw-file/${TAG}/ooo.lst
+wget http://cgit.freedesktop.org/ooo-build/bootstrap/plain/fetch_tarballs.sh?id=$GIT_TAG -O fetch_tarballs.sh && chmod 755 fetch_tarballs.sh
+wget http://cgit.freedesktop.org/ooo-build/bootstrap/plain/ooo.lst?id=$GIT_TAG -O ooo.lst
 ./fetch_tarballs.sh ooo.lst &&  rm -f fetch_tarballs.sh ooo.lst
 cd ..
 rmdir $tmp
